Delete the menu on close in the wxWebView sample. Fixes most of the memory leaks.

[wxWidgets.git] / Makefile.in
diff --git a/Makefile.in b/Makefile.in

index 775be9537a1f04c5720fd22a3cc3335be44f2b6a..65c25a9077b9c8d13764bfaec3b4121e989ebcbe 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
  # =========================================================================
  #     This makefile was generated by
  # =========================================================================
  #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.9 (http://www.bakefile.org)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -27,6 +27,7 @@ STRIP = @STRIP@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_DIR = @INSTALL_DIR@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_DIR = @INSTALL_DIR@
+ICC_PCH_USE_SWITCH = @ICC_PCH_USE_SWITCH@
  BK_DEPS = @BK_DEPS@
  BK_MAKE_PCH = @BK_MAKE_PCH@
  srcdir = @srcdir@
  BK_DEPS = @BK_DEPS@
  BK_MAKE_PCH = @BK_MAKE_PCH@
  srcdir = @srcdir@
@@ -45,6 +46,7 @@ CC = @CC@
  CXX = @CXX@
  CFLAGS = @CFLAGS@
  CXXFLAGS = @CXXFLAGS@
  CXX = @CXX@
  CFLAGS = @CFLAGS@
  CXXFLAGS = @CXXFLAGS@
+OBJCXXFLAGS = @OBJCXXFLAGS@
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  VENDOR = @VENDOR@
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  VENDOR = @VENDOR@
@@ -65,6 +67,8 @@ EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
  EXTRALIBS_SDL = @EXTRALIBS_SDL@
  CXXWARNINGS = @CXXWARNINGS@
  HOST_SUFFIX = @HOST_SUFFIX@
  EXTRALIBS_SDL = @EXTRALIBS_SDL@
  CXXWARNINGS = @CXXWARNINGS@
  HOST_SUFFIX = @HOST_SUFFIX@
+DYLIB_RPATH_INSTALL = @DYLIB_RPATH_INSTALL@
+DYLIB_RPATH_POSTLINK = @DYLIB_RPATH_POSTLINK@
  wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
@@ -72,17 +76,17 @@ wx_top_builddir = @wx_top_builddir@
  DESTDIR = 
  WX_RELEASE = 2.9
  WX_RELEASE_NODOT = 29
  DESTDIR = 
  WX_RELEASE = 2.9
  WX_RELEASE_NODOT = 29
-WX_VERSION = $(WX_RELEASE).0
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
+WX_VERSION = $(WX_RELEASE).3
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3
  LIBDIRNAME = $(wx_top_builddir)/lib
  LIBDIRNAME = $(wx_top_builddir)/lib
-WXREGEX_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(____SHARED) \
+WXREGEX_CFLAGS = -DNDEBUG -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(____SHARED) \
         $(CPPFLAGS) $(CFLAGS)
  WXREGEX_OBJECTS =  \
         wxregex_regcomp.o \
         wxregex_regexec.o \
         wxregex_regerror.o \
         wxregex_regfree.o
         $(CPPFLAGS) $(CFLAGS)
  WXREGEX_OBJECTS =  \
         wxregex_regcomp.o \
         wxregex_regexec.o \
         wxregex_regerror.o \
         wxregex_regfree.o
-WXZLIB_CFLAGS =        $(____SHARED) $(CPPFLAGS) $(CFLAGS)
+WXZLIB_CFLAGS =       -DNDEBUG  $(____SHARED) $(CPPFLAGS) $(CFLAGS)
  WXZLIB_OBJECTS =  \
         wxzlib_adler32.o \
         wxzlib_compress.o \
  WXZLIB_OBJECTS =  \
         wxzlib_adler32.o \
         wxzlib_compress.o \
@@ -96,11 +100,10 @@ WXZLIB_OBJECTS =  \
         wxzlib_infback.o \
         wxzlib_inftrees.o \
         wxzlib_inffast.o
         wxzlib_infback.o \
         wxzlib_inftrees.o \
         wxzlib_inffast.o
-WXPNG_CFLAGS =       $(__INC_ZLIB_p)  $(____SHARED) $(CPPFLAGS) $(CFLAGS)
+WXPNG_CFLAGS = -DNDEBUG $(__INC_ZLIB_p) $(____SHARED) $(CPPFLAGS) $(CFLAGS)
  WXPNG_OBJECTS =  \
         wxpng_png.o \
         wxpng_pngerror.o \
  WXPNG_OBJECTS =  \
         wxpng_png.o \
         wxpng_pngerror.o \
-       wxpng_pnggccrd.o \
         wxpng_pngget.o \
         wxpng_pngmem.o \
         wxpng_pngpread.o \
         wxpng_pngget.o \
         wxpng_pngmem.o \
         wxpng_pngpread.o \
@@ -110,12 +113,11 @@ WXPNG_OBJECTS =  \
         wxpng_pngrutil.o \
         wxpng_pngset.o \
         wxpng_pngtrans.o \
         wxpng_pngrutil.o \
         wxpng_pngset.o \
         wxpng_pngtrans.o \
-       wxpng_pngvcrd.o \
         wxpng_pngwio.o \
         wxpng_pngwrite.o \
         wxpng_pngwtran.o \
         wxpng_pngwutil.o
         wxpng_pngwio.o \
         wxpng_pngwrite.o \
         wxpng_pngwtran.o \
         wxpng_pngwutil.o
-WXJPEG_CFLAGS =        $(____SHARED) $(CPPFLAGS) $(CFLAGS)
+WXJPEG_CFLAGS =       -DNDEBUG  $(____SHARED) $(CPPFLAGS) $(CFLAGS)
  WXJPEG_OBJECTS =  \
         wxjpeg_jcomapi.o \
         wxjpeg_jutils.o \
  WXJPEG_OBJECTS =  \
         wxjpeg_jcomapi.o \
         wxjpeg_jutils.o \
@@ -163,7 +165,7 @@ WXJPEG_OBJECTS =  \
         wxjpeg_jquant1.o \
         wxjpeg_jquant2.o \
         wxjpeg_jdmerge.o
         wxjpeg_jquant1.o \
         wxjpeg_jquant2.o \
         wxjpeg_jdmerge.o
-WXTIFF_CFLAGS = $(__INC_ZLIB_p) $(__INC_JPEG_p) $(__INC_TIFF_BUILD_p) \
+WXTIFF_CFLAGS = -DNDEBUG $(__INC_ZLIB_p) $(__INC_JPEG_p) $(__INC_TIFF_BUILD_p) \
         $(__INC_TIFF_p) $(____SHARED) $(CPPFLAGS) $(CFLAGS)
  WXTIFF_OBJECTS =  \
         $(__TIFF_PLATFORM_SRC_OBJECTS) \
         $(__INC_TIFF_p) $(____SHARED) $(CPPFLAGS) $(CFLAGS)
  WXTIFF_OBJECTS =  \
         $(__TIFF_PLATFORM_SRC_OBJECTS) \
@@ -202,14 +204,15 @@ WXTIFF_OBJECTS =  \
         wxtiff_tif_warning.o \
         wxtiff_tif_write.o \
         wxtiff_tif_zip.o
         wxtiff_tif_warning.o \
         wxtiff_tif_write.o \
         wxtiff_tif_zip.o
-WXEXPAT_CFLAGS =       -I./src/expat  $(____SHARED) $(CPPFLAGS) $(CFLAGS)
+WXEXPAT_CFLAGS = -DNDEBUG -I./src/expat $(____SHARED) $(CPPFLAGS) $(CFLAGS)
  WXEXPAT_OBJECTS =  \
         wxexpat_xmlparse.o \
         wxexpat_xmlrole.o \
         wxexpat_xmltok.o
  WXEXPAT_OBJECTS =  \
         wxexpat_xmlparse.o \
         wxexpat_xmlrole.o \
         wxexpat_xmltok.o
-WXSCINTILLA_CXXFLAGS = -I$(top_srcdir)/src/stc/scintilla/include \
+WXSCINTILLA_CXXFLAGS = -DNDEBUG -I$(top_srcdir)/src/stc/scintilla/include \
         -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
         -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
-       $(____SHARED) $(CPPFLAGS) $(CXXFLAGS)
+       $(__wxscintilla_usingdll_p) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(____SHARED) $(CPPFLAGS) $(CXXFLAGS)
  WXSCINTILLA_OBJECTS =  \
         wxscintilla_AutoComplete.o \
         wxscintilla_CallTip.o \
  WXSCINTILLA_OBJECTS =  \
         wxscintilla_AutoComplete.o \
         wxscintilla_CallTip.o \
@@ -225,8 +228,8 @@ WXSCINTILLA_OBJECTS =  \
         wxscintilla_KeyMap.o \
         wxscintilla_KeyWords.o \
         wxscintilla_LexAPDL.o \
         wxscintilla_KeyMap.o \
         wxscintilla_KeyWords.o \
         wxscintilla_LexAPDL.o \
-       wxscintilla_LexAU3.o \
         wxscintilla_LexASY.o \
         wxscintilla_LexASY.o \
+       wxscintilla_LexAU3.o \
         wxscintilla_LexAVE.o \
         wxscintilla_LexAbaqus.o \
         wxscintilla_LexAda.o \
         wxscintilla_LexAVE.o \
         wxscintilla_LexAbaqus.o \
         wxscintilla_LexAda.o \
@@ -237,13 +240,14 @@ WXSCINTILLA_OBJECTS =  \
         wxscintilla_LexBasic.o \
         wxscintilla_LexBullant.o \
         wxscintilla_LexCLW.o \
         wxscintilla_LexBasic.o \
         wxscintilla_LexBullant.o \
         wxscintilla_LexCLW.o \
-       wxscintilla_LexCmake.o \
+       wxscintilla_LexCOBOL.o \
         wxscintilla_LexCPP.o \
         wxscintilla_LexCSS.o \
         wxscintilla_LexCaml.o \
         wxscintilla_LexCPP.o \
         wxscintilla_LexCSS.o \
         wxscintilla_LexCaml.o \
-       wxscintilla_LexCsound.o \
+       wxscintilla_LexCmake.o \
         wxscintilla_LexConf.o \
         wxscintilla_LexCrontab.o \
         wxscintilla_LexConf.o \
         wxscintilla_LexCrontab.o \
+       wxscintilla_LexCsound.o \
         wxscintilla_LexD.o \
         wxscintilla_LexEScript.o \
         wxscintilla_LexEiffel.o \
         wxscintilla_LexD.o \
         wxscintilla_LexEScript.o \
         wxscintilla_LexEiffel.o \
@@ -263,28 +267,38 @@ WXSCINTILLA_OBJECTS =  \
         wxscintilla_LexMMIXAL.o \
         wxscintilla_LexMPT.o \
         wxscintilla_LexMSSQL.o \
         wxscintilla_LexMMIXAL.o \
         wxscintilla_LexMPT.o \
         wxscintilla_LexMSSQL.o \
+       wxscintilla_LexMagik.o \
+       wxscintilla_LexMarkdown.o \
         wxscintilla_LexMatlab.o \
         wxscintilla_LexMetapost.o \
         wxscintilla_LexMatlab.o \
         wxscintilla_LexMetapost.o \
+       wxscintilla_LexMySQL.o \
+       wxscintilla_LexNimrod.o \
         wxscintilla_LexNsis.o \
         wxscintilla_LexOpal.o \
         wxscintilla_LexOthers.o \
         wxscintilla_LexPB.o \
         wxscintilla_LexPLM.o \
         wxscintilla_LexPOV.o \
         wxscintilla_LexNsis.o \
         wxscintilla_LexOpal.o \
         wxscintilla_LexOthers.o \
         wxscintilla_LexPB.o \
         wxscintilla_LexPLM.o \
         wxscintilla_LexPOV.o \
-       wxscintilla_LexProgress.o \
         wxscintilla_LexPS.o \
         wxscintilla_LexPascal.o \
         wxscintilla_LexPerl.o \
         wxscintilla_LexPS.o \
         wxscintilla_LexPascal.o \
         wxscintilla_LexPerl.o \
+       wxscintilla_LexPowerPro.o \
+       wxscintilla_LexPowerShell.o \
+       wxscintilla_LexProgress.o \
         wxscintilla_LexPython.o \
         wxscintilla_LexR.o \
         wxscintilla_LexRebol.o \
         wxscintilla_LexRuby.o \
         wxscintilla_LexPython.o \
         wxscintilla_LexR.o \
         wxscintilla_LexRebol.o \
         wxscintilla_LexRuby.o \
+       wxscintilla_LexSML.o \
         wxscintilla_LexSQL.o \
         wxscintilla_LexSQL.o \
-       wxscintilla_LexSmalltalk.o \
-       wxscintilla_LexTADS3.o \
         wxscintilla_LexScriptol.o \
         wxscintilla_LexScriptol.o \
+       wxscintilla_LexSmalltalk.o \
+       wxscintilla_LexSorcus.o \
         wxscintilla_LexSpecman.o \
         wxscintilla_LexSpice.o \
         wxscintilla_LexSpecman.o \
         wxscintilla_LexSpice.o \
+       wxscintilla_LexTACL.o \
+       wxscintilla_LexTADS3.o \
+       wxscintilla_LexTAL.o \
         wxscintilla_LexTCL.o \
         wxscintilla_LexTeX.o \
         wxscintilla_LexVB.o \
         wxscintilla_LexTCL.o \
         wxscintilla_LexTeX.o \
         wxscintilla_LexVB.o \
@@ -292,11 +306,13 @@ WXSCINTILLA_OBJECTS =  \
         wxscintilla_LexVerilog.o \
         wxscintilla_LexYAML.o \
         wxscintilla_LineMarker.o \
         wxscintilla_LexVerilog.o \
         wxscintilla_LexYAML.o \
         wxscintilla_LineMarker.o \
+       wxscintilla_PerLine.o \
         wxscintilla_PositionCache.o \
         wxscintilla_PropSet.o \
         wxscintilla_RESearch.o \
         wxscintilla_RunStyles.o \
         wxscintilla_ScintillaBase.o \
         wxscintilla_PositionCache.o \
         wxscintilla_PropSet.o \
         wxscintilla_RESearch.o \
         wxscintilla_RunStyles.o \
         wxscintilla_ScintillaBase.o \
+       wxscintilla_Selection.o \
         wxscintilla_Style.o \
         wxscintilla_StyleContext.o \
         wxscintilla_UniConversion.o \
         wxscintilla_Style.o \
         wxscintilla_StyleContext.o \
         wxscintilla_UniConversion.o \
@@ -306,6 +322,8 @@ WXSCINTILLA_OBJECTS =  \
  PLUGINS_INST_DIR = $(libdir)/wx/$(PLUGIN_VERSION0)
  ALL_BASE_HEADERS =  \
         wx/afterstd.h \
  PLUGINS_INST_DIR = $(libdir)/wx/$(PLUGIN_VERSION0)
  ALL_BASE_HEADERS =  \
         wx/afterstd.h \
+       wx/any.h \
+       wx/anystr.h \
         wx/app.h \
         wx/apptrait.h \
         wx/archive.h \
         wx/app.h \
         wx/apptrait.h \
         wx/archive.h \
@@ -317,6 +335,7 @@ ALL_BASE_HEADERS =  \
         wx/buffer.h \
         wx/build.h \
         wx/chartype.h \
         wx/buffer.h \
         wx/build.h \
         wx/chartype.h \
+       wx/checkeddelete.h \
         wx/chkconf.h \
         wx/clntdata.h \
         wx/cmdargs.h \
         wx/chkconf.h \
         wx/clntdata.h \
         wx/cmdargs.h \
@@ -334,11 +353,13 @@ ALL_BASE_HEADERS =  \
         wx/defs.h \
         wx/dir.h \
         wx/dlimpexp.h \
         wx/defs.h \
         wx/dir.h \
         wx/dlimpexp.h \
+       wx/dlist.h \
         wx/dynarray.h \
         wx/dynlib.h \
         wx/dynload.h \
         wx/encconv.h \
         wx/event.h \
         wx/dynarray.h \
         wx/dynlib.h \
         wx/dynload.h \
         wx/encconv.h \
         wx/event.h \
+       wx/evtloop.h \
         wx/except.h \
         wx/features.h \
         wx/flags.h \
         wx/except.h \
         wx/features.h \
         wx/flags.h \
@@ -365,6 +386,8 @@ ALL_BASE_HEADERS =  \
         wx/ioswrap.h \
         wx/ipc.h \
         wx/ipcbase.h \
         wx/ioswrap.h \
         wx/ipc.h \
         wx/ipcbase.h \
+       wx/kbdstate.h \
+       wx/language.h \
         wx/link.h \
         wx/list.h \
         wx/listimpl.cpp \
         wx/link.h \
         wx/list.h \
         wx/listimpl.cpp \
@@ -376,8 +399,11 @@ ALL_BASE_HEADERS =  \
         wx/memtext.h \
         wx/mimetype.h \
         wx/module.h \
         wx/memtext.h \
         wx/mimetype.h \
         wx/module.h \
+       wx/mousestate.h \
         wx/msgout.h \
         wx/msgout.h \
+       wx/msgqueue.h \
         wx/mstream.h \
         wx/mstream.h \
+       wx/numformatter.h \
         wx/object.h \
         wx/platform.h \
         wx/platinfo.h \
         wx/object.h \
         wx/platform.h \
         wx/platinfo.h \
@@ -387,12 +413,17 @@ ALL_BASE_HEADERS =  \
         wx/ptr_shrd.h \
         wx/recguard.h \
         wx/regex.h \
         wx/ptr_shrd.h \
         wx/recguard.h \
         wx/regex.h \
+       wx/rtti.h \
+       wx/scopedarray.h \
+       wx/scopedptr.h \
         wx/scopeguard.h \
         wx/scopeguard.h \
+       wx/sharedptr.h \
         wx/snglinst.h \
         wx/sstream.h \
         wx/stack.h \
         wx/stackwalk.h \
         wx/stdpaths.h \
         wx/snglinst.h \
         wx/sstream.h \
         wx/stack.h \
         wx/stackwalk.h \
         wx/stdpaths.h \
+       wx/stdstream.h \
         wx/stockitem.h \
         wx/stopwatch.h \
         wx/strconv.h \
         wx/stockitem.h \
         wx/stopwatch.h \
         wx/strconv.h \
@@ -408,9 +439,12 @@ ALL_BASE_HEADERS =  \
         wx/thread.h \
         wx/thrimpl.cpp \
         wx/timer.h \
         wx/thread.h \
         wx/thrimpl.cpp \
         wx/timer.h \
+       wx/tls.h \
         wx/tokenzr.h \
         wx/tracker.h \
         wx/tokenzr.h \
         wx/tracker.h \
+       wx/translation.h \
         wx/txtstrm.h \
         wx/txtstrm.h \
+       wx/typeinfo.h \
         wx/types.h \
         wx/unichar.h \
         wx/uri.h \
         wx/types.h \
         wx/unichar.h \
         wx/uri.h \
@@ -419,6 +453,7 @@ ALL_BASE_HEADERS =  \
         wx/variant.h \
         wx/vector.h \
         wx/version.h \
         wx/variant.h \
         wx/vector.h \
         wx/version.h \
+       wx/versioninfo.h \
         wx/volume.h \
         wx/weakref.h \
         wx/wfstream.h \
         wx/volume.h \
         wx/weakref.h \
         wx/wfstream.h \
@@ -430,26 +465,34 @@ ALL_BASE_HEADERS =  \
         wx/wxprec.h \
         wx/xlocale.h \
         wx/xti.h \
         wx/wxprec.h \
         wx/xlocale.h \
         wx/xti.h \
+       wx/xti2.h \
         wx/xtistrm.h \
         wx/xtistrm.h \
+       wx/xtictor.h \
+       wx/xtihandler.h \
+       wx/xtiprop.h \
+       wx/xtitypes.h \
         wx/zipstrm.h \
         wx/zstream.h \
         wx/meta/convertible.h \
         wx/meta/if.h \
         wx/zipstrm.h \
         wx/zstream.h \
         wx/meta/convertible.h \
         wx/meta/if.h \
+       wx/meta/implicitconversion.h \
         wx/meta/int2type.h \
         wx/meta/movable.h \
         wx/meta/int2type.h \
         wx/meta/movable.h \
+       wx/meta/pod.h \
+       wx/fswatcher.h \
+       wx/generic/fswatcher.h \
         $(BASE_PLATFORM_HDR) \
         wx/fs_inet.h \
         $(BASE_PLATFORM_HDR) \
         wx/fs_inet.h \
-       wx/gsocket.h \
         wx/protocol/file.h \
         wx/protocol/ftp.h \
         wx/protocol/http.h \
         wx/protocol/file.h \
         wx/protocol/ftp.h \
         wx/protocol/http.h \
+       wx/protocol/log.h \
         wx/protocol/protocol.h \
         wx/sckaddr.h \
         wx/sckipc.h \
         wx/sckstrm.h \
         wx/socket.h \
         wx/url.h \
         wx/protocol/protocol.h \
         wx/sckaddr.h \
         wx/sckipc.h \
         wx/sckstrm.h \
         wx/socket.h \
         wx/url.h \
-       $(NET_PLATFORM_HDR) \
         wx/xml/xml.h \
         wx/xtixml.h
  ALL_HEADERS =  \
         wx/xml/xml.h \
         wx/xtixml.h
  ALL_HEADERS =  \
@@ -457,6 +500,8 @@ ALL_HEADERS =  \
         $(ALL_GUI_HEADERS)
  ALL_PORTS_BASE_HEADERS =  \
         wx/afterstd.h \
         $(ALL_GUI_HEADERS)
  ALL_PORTS_BASE_HEADERS =  \
         wx/afterstd.h \
+       wx/any.h \
+       wx/anystr.h \
         wx/app.h \
         wx/apptrait.h \
         wx/archive.h \
         wx/app.h \
         wx/apptrait.h \
         wx/archive.h \
@@ -468,6 +513,7 @@ ALL_PORTS_BASE_HEADERS =  \
         wx/buffer.h \
         wx/build.h \
         wx/chartype.h \
         wx/buffer.h \
         wx/build.h \
         wx/chartype.h \
+       wx/checkeddelete.h \
         wx/chkconf.h \
         wx/clntdata.h \
         wx/cmdargs.h \
         wx/chkconf.h \
         wx/clntdata.h \
         wx/cmdargs.h \
@@ -485,11 +531,13 @@ ALL_PORTS_BASE_HEADERS =  \
         wx/defs.h \
         wx/dir.h \
         wx/dlimpexp.h \
         wx/defs.h \
         wx/dir.h \
         wx/dlimpexp.h \
+       wx/dlist.h \
         wx/dynarray.h \
         wx/dynlib.h \
         wx/dynload.h \
         wx/encconv.h \
         wx/event.h \
         wx/dynarray.h \
         wx/dynlib.h \
         wx/dynload.h \
         wx/encconv.h \
         wx/event.h \
+       wx/evtloop.h \
         wx/except.h \
         wx/features.h \
         wx/flags.h \
         wx/except.h \
         wx/features.h \
         wx/flags.h \
@@ -516,6 +564,8 @@ ALL_PORTS_BASE_HEADERS =  \
         wx/ioswrap.h \
         wx/ipc.h \
         wx/ipcbase.h \
         wx/ioswrap.h \
         wx/ipc.h \
         wx/ipcbase.h \
+       wx/kbdstate.h \
+       wx/language.h \
         wx/link.h \
         wx/list.h \
         wx/listimpl.cpp \
         wx/link.h \
         wx/list.h \
         wx/listimpl.cpp \
@@ -527,8 +577,11 @@ ALL_PORTS_BASE_HEADERS =  \
         wx/memtext.h \
         wx/mimetype.h \
         wx/module.h \
         wx/memtext.h \
         wx/mimetype.h \
         wx/module.h \
+       wx/mousestate.h \
         wx/msgout.h \
         wx/msgout.h \
+       wx/msgqueue.h \
         wx/mstream.h \
         wx/mstream.h \
+       wx/numformatter.h \
         wx/object.h \
         wx/platform.h \
         wx/platinfo.h \
         wx/object.h \
         wx/platform.h \
         wx/platinfo.h \
@@ -538,12 +591,17 @@ ALL_PORTS_BASE_HEADERS =  \
         wx/ptr_shrd.h \
         wx/recguard.h \
         wx/regex.h \
         wx/ptr_shrd.h \
         wx/recguard.h \
         wx/regex.h \
+       wx/rtti.h \
+       wx/scopedarray.h \
+       wx/scopedptr.h \
         wx/scopeguard.h \
         wx/scopeguard.h \
+       wx/sharedptr.h \
         wx/snglinst.h \
         wx/sstream.h \
         wx/stack.h \
         wx/stackwalk.h \
         wx/stdpaths.h \
         wx/snglinst.h \
         wx/sstream.h \
         wx/stack.h \
         wx/stackwalk.h \
         wx/stdpaths.h \
+       wx/stdstream.h \
         wx/stockitem.h \
         wx/stopwatch.h \
         wx/strconv.h \
         wx/stockitem.h \
         wx/stopwatch.h \
         wx/strconv.h \
@@ -559,9 +617,12 @@ ALL_PORTS_BASE_HEADERS =  \
         wx/thread.h \
         wx/thrimpl.cpp \
         wx/timer.h \
         wx/thread.h \
         wx/thrimpl.cpp \
         wx/timer.h \
+       wx/tls.h \
         wx/tokenzr.h \
         wx/tracker.h \
         wx/tokenzr.h \
         wx/tracker.h \
+       wx/translation.h \
         wx/txtstrm.h \
         wx/txtstrm.h \
+       wx/typeinfo.h \
         wx/types.h \
         wx/unichar.h \
         wx/uri.h \
         wx/types.h \
         wx/unichar.h \
         wx/uri.h \
@@ -570,6 +631,7 @@ ALL_PORTS_BASE_HEADERS =  \
         wx/variant.h \
         wx/vector.h \
         wx/version.h \
         wx/variant.h \
         wx/vector.h \
         wx/version.h \
+       wx/versioninfo.h \
         wx/volume.h \
         wx/weakref.h \
         wx/wfstream.h \
         wx/volume.h \
         wx/weakref.h \
         wx/wfstream.h \
@@ -581,28 +643,36 @@ ALL_PORTS_BASE_HEADERS =  \
         wx/wxprec.h \
         wx/xlocale.h \
         wx/xti.h \
         wx/wxprec.h \
         wx/xlocale.h \
         wx/xti.h \
+       wx/xti2.h \
         wx/xtistrm.h \
         wx/xtistrm.h \
+       wx/xtictor.h \
+       wx/xtihandler.h \
+       wx/xtiprop.h \
+       wx/xtitypes.h \
         wx/zipstrm.h \
         wx/zstream.h \
         wx/meta/convertible.h \
         wx/meta/if.h \
         wx/zipstrm.h \
         wx/zstream.h \
         wx/meta/convertible.h \
         wx/meta/if.h \
+       wx/meta/implicitconversion.h \
         wx/meta/int2type.h \
         wx/meta/movable.h \
         wx/meta/int2type.h \
         wx/meta/movable.h \
-       wx/private/fdiodispatcher.h \
-       wx/private/selectdispatcher.h \
+       wx/meta/pod.h \
+       wx/fswatcher.h \
+       wx/generic/fswatcher.h \
         wx/unix/app.h \
         wx/unix/apptbase.h \
         wx/unix/apptrait.h \
         wx/unix/chkconf.h \
         wx/unix/evtloop.h \
         wx/unix/app.h \
         wx/unix/apptbase.h \
         wx/unix/apptrait.h \
         wx/unix/chkconf.h \
         wx/unix/evtloop.h \
+       wx/unix/evtloopsrc.h \
         wx/unix/pipe.h \
         wx/unix/stdpaths.h \
         wx/unix/stackwalk.h \
         wx/unix/tls.h \
         wx/unix/pipe.h \
         wx/unix/stdpaths.h \
         wx/unix/stackwalk.h \
         wx/unix/tls.h \
+       wx/unix/fswatcher_kqueue.h \
         wx/unix/execute.h \
         wx/unix/mimetype.h \
         wx/unix/execute.h \
         wx/unix/mimetype.h \
-       wx/unix/private.h \
-       wx/private/gsocketiohandler.h \
+       wx/unix/fswatcher_inotify.h \
         wx/msw/apptrait.h \
         wx/msw/apptbase.h \
         wx/msw/chkconf.h \
         wx/msw/apptrait.h \
         wx/msw/apptbase.h \
         wx/msw/chkconf.h \
@@ -623,6 +693,7 @@ ALL_PORTS_BASE_HEADERS =  \
         wx/msw/wrapcctl.h \
         wx/msw/wrapcdlg.h \
         wx/msw/wrapwin.h \
         wx/msw/wrapcctl.h \
         wx/msw/wrapcdlg.h \
         wx/msw/wrapwin.h \
+       wx/msw/fswatcher.h \
         $(BASE_WINCE_HDR) \
         $(BASE_OSX_HDR) \
         wx/palmos/apptbase.h \
         $(BASE_WINCE_HDR) \
         $(BASE_OSX_HDR) \
         wx/palmos/apptbase.h \
@@ -633,24 +704,20 @@ ALL_PORTS_BASE_HEADERS =  \
         wx/palmos/stdpaths.h \
         wx/msdos/mimetype.h \
         wx/fs_inet.h \
         wx/palmos/stdpaths.h \
         wx/msdos/mimetype.h \
         wx/fs_inet.h \
-       wx/gsocket.h \
         wx/protocol/file.h \
         wx/protocol/ftp.h \
         wx/protocol/http.h \
         wx/protocol/file.h \
         wx/protocol/ftp.h \
         wx/protocol/http.h \
+       wx/protocol/log.h \
         wx/protocol/protocol.h \
         wx/sckaddr.h \
         wx/sckipc.h \
         wx/sckstrm.h \
         wx/socket.h \
         wx/url.h \
         wx/protocol/protocol.h \
         wx/sckaddr.h \
         wx/sckipc.h \
         wx/sckstrm.h \
         wx/socket.h \
         wx/url.h \
-       wx/unix/gsockunx.h \
-       wx/msw/gsockmsw.h \
-       $(NET_WINCE_HDR) \
-       wx/unix/gsockunx.h \
-       wx/unix/gsockunx.h \
         wx/xml/xml.h \
         wx/xtixml.h
  ALL_BASE_SOURCES =  \
         wx/xml/xml.h \
         wx/xtixml.h
  ALL_BASE_SOURCES =  \
+       src/common/any.cpp \
         src/common/appbase.cpp \
         src/common/arcall.cpp \
         src/common/arcfind.cpp \
         src/common/appbase.cpp \
         src/common/arcall.cpp \
         src/common/arcfind.cpp \
@@ -662,6 +729,7 @@ ALL_BASE_SOURCES =  \
         src/common/config.cpp \
         src/common/convauto.cpp \
         src/common/datetime.cpp \
         src/common/config.cpp \
         src/common/convauto.cpp \
         src/common/datetime.cpp \
+       src/common/datetimefmt.cpp \
         src/common/datstrm.cpp \
         src/common/dircmn.cpp \
         src/common/dynarray.cpp \
         src/common/datstrm.cpp \
         src/common/dircmn.cpp \
         src/common/dynarray.cpp \
@@ -687,6 +755,7 @@ ALL_BASE_SOURCES =  \
         src/common/init.cpp \
         src/common/intl.cpp \
         src/common/ipcbase.cpp \
         src/common/init.cpp \
         src/common/intl.cpp \
         src/common/ipcbase.cpp \
+       src/common/languageinfo.cpp \
         src/common/list.cpp \
         src/common/log.cpp \
         src/common/longlong.cpp \
         src/common/list.cpp \
         src/common/log.cpp \
         src/common/longlong.cpp \
@@ -694,6 +763,7 @@ ALL_BASE_SOURCES =  \
         src/common/mimecmn.cpp \
         src/common/module.cpp \
         src/common/mstream.cpp \
         src/common/mimecmn.cpp \
         src/common/module.cpp \
         src/common/mstream.cpp \
+       src/common/numformatter.cpp \
         src/common/object.cpp \
         src/common/platinfo.cpp \
         src/common/powercmn.cpp \
         src/common/object.cpp \
         src/common/platinfo.cpp \
         src/common/powercmn.cpp \
@@ -701,6 +771,7 @@ ALL_BASE_SOURCES =  \
         src/common/regex.cpp \
         src/common/stdpbase.cpp \
         src/common/sstream.cpp \
         src/common/regex.cpp \
         src/common/stdpbase.cpp \
         src/common/sstream.cpp \
+       src/common/stdstream.cpp \
         src/common/stopwatch.cpp \
         src/common/strconv.cpp \
         src/common/stream.cpp \
         src/common/stopwatch.cpp \
         src/common/strconv.cpp \
         src/common/stream.cpp \
@@ -715,6 +786,7 @@ ALL_BASE_SOURCES =  \
         src/common/timercmn.cpp \
         src/common/timerimpl.cpp \
         src/common/tokenzr.cpp \
         src/common/timercmn.cpp \
         src/common/timerimpl.cpp \
         src/common/tokenzr.cpp \
+       src/common/translation.cpp \
         src/common/txtstrm.cpp \
         src/common/unichar.cpp \
         src/common/uri.cpp \
         src/common/txtstrm.cpp \
         src/common/unichar.cpp \
         src/common/uri.cpp \
@@ -728,21 +800,25 @@ ALL_BASE_SOURCES =  \
         src/common/xtistrm.cpp \
         src/common/zipstrm.cpp \
         src/common/zstream.cpp \
         src/common/xtistrm.cpp \
         src/common/zipstrm.cpp \
         src/common/zstream.cpp \
+       src/common/fswatchercmn.cpp \
+       src/generic/fswatcherg.cpp \
         src/common/fdiodispatcher.cpp \
         src/common/selectdispatcher.cpp \
         src/common/fdiodispatcher.cpp \
         src/common/selectdispatcher.cpp \
-       src/unix/epolldispatcher.cpp \
         src/unix/appunix.cpp \
         src/unix/appunix.cpp \
-       src/unix/evtloopunix.cpp \
         src/unix/dir.cpp \
         src/unix/dlunix.cpp \
         src/unix/dir.cpp \
         src/unix/dlunix.cpp \
+       src/unix/epolldispatcher.cpp \
+       src/unix/evtloopunix.cpp \
+       src/unix/fdiounix.cpp \
         src/unix/snglinst.cpp \
         src/unix/snglinst.cpp \
+       src/unix/stackwalk.cpp \
         src/unix/stdpaths.cpp \
         src/unix/timerunx.cpp \
         src/unix/threadpsx.cpp \
         src/unix/stdpaths.cpp \
         src/unix/timerunx.cpp \
         src/unix/threadpsx.cpp \
-       src/unix/stackwalk.cpp \
         src/unix/utilsunx.cpp \
         src/unix/utilsunx.cpp \
+       src/unix/fswatcher_kqueue.cpp \
         src/unix/mimetype.cpp \
         src/unix/mimetype.cpp \
-       src/common/gsocketiohandler.cpp \
+       src/unix/fswatcher_inotify.cpp \
         src/msw/basemsw.cpp \
         src/msw/crashrpt.cpp \
         src/msw/debughlp.cpp \
         src/msw/basemsw.cpp \
         src/msw/crashrpt.cpp \
         src/msw/debughlp.cpp \
@@ -760,16 +836,17 @@ ALL_BASE_SOURCES =  \
         src/msw/timer.cpp \
         src/msw/utils.cpp \
         src/msw/utilsexc.cpp \
         src/msw/timer.cpp \
         src/msw/utils.cpp \
         src/msw/utilsexc.cpp \
+       src/msw/fswatcher.cpp \
         $(BASE_WINCE_SRC) \
         $(BASE_OSX_SRC) \
         src/common/fdiodispatcher.cpp \
         src/common/selectdispatcher.cpp \
         $(BASE_WINCE_SRC) \
         $(BASE_OSX_SRC) \
         src/common/fdiodispatcher.cpp \
         src/common/selectdispatcher.cpp \
-       src/common/gsocketiohandler.cpp \
         src/unix/appunix.cpp \
         src/unix/evtloopunix.cpp \
         src/unix/timerunx.cpp \
         src/os2/dir.cpp \
         src/os2/mimetype.cpp \
         src/unix/appunix.cpp \
         src/unix/evtloopunix.cpp \
         src/unix/timerunx.cpp \
         src/os2/dir.cpp \
         src/os2/mimetype.cpp \
+       src/os2/snglinst.cpp \
         src/os2/stdpaths.cpp \
         src/os2/thread.cpp \
         src/os2/utils.cpp \
         src/os2/stdpaths.cpp \
         src/os2/thread.cpp \
         src/os2/utils.cpp \
@@ -806,29 +883,40 @@ ALL_BASE_SOURCES =  \
         src/common/sckstrm.cpp \
         src/common/socket.cpp \
         src/common/url.cpp \
         src/common/sckstrm.cpp \
         src/common/socket.cpp \
         src/common/url.cpp \
-       src/unix/gsocket.cpp \
-       src/msw/gsocket.cpp \
-       src/msw/gsockmsw.cpp \
+       src/common/socketiohandler.cpp \
+       src/unix/sockunix.cpp \
+       src/osx/core/sockosx.cpp \
+       src/msw/sockmsw.cpp \
         src/msw/urlmsw.cpp \
         $(NET_WINCE_SRC) \
         src/xml/xml.cpp \
         src/common/xtixml.cpp
  MONODLL_CFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         src/msw/urlmsw.cpp \
         $(NET_WINCE_SRC) \
         src/xml/xml.cpp \
         src/common/xtixml.cpp
  MONODLL_CFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       -DwxUSE_BASE=1 -DWXMAKINGDLL -I$(top_srcdir)/src/stc/scintilla/include \
-       -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
-       $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS)
-MONODLL_CXXFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
         $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
         $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
         $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
         $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) -DwxUSE_BASE=1 -DWXMAKINGDLL \
+       $(__INC_EXPAT_p) -I$(top_srcdir)/src/stc/scintilla/include \
+       -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
+       -DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS)
+MONODLL_CXXFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) \
         -I$(top_srcdir)/src/stc/scintilla/include \
         -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
         -I$(top_srcdir)/src/stc/scintilla/include \
         -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
-       $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       -DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) \
+       $(CXXFLAGS)
+MONODLL_OBJCXXFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -I$(top_srcdir)/src/stc/scintilla/include \
+       -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
+       -DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) $(CPPFLAGS) $(OBJCXXFLAGS)
  MONODLL_OBJECTS =  \
  MONODLL_OBJECTS =  \
+       monodll_any.o \
         monodll_appbase.o \
         monodll_arcall.o \
         monodll_arcfind.o \
         monodll_appbase.o \
         monodll_arcall.o \
         monodll_arcfind.o \
@@ -840,6 +928,7 @@ MONODLL_OBJECTS =  \
         monodll_config.o \
         monodll_convauto.o \
         monodll_datetime.o \
         monodll_config.o \
         monodll_convauto.o \
         monodll_datetime.o \
+       monodll_datetimefmt.o \
         monodll_datstrm.o \
         monodll_dircmn.o \
         monodll_dynarray.o \
         monodll_datstrm.o \
         monodll_dircmn.o \
         monodll_dynarray.o \
@@ -865,6 +954,7 @@ MONODLL_OBJECTS =  \
         monodll_init.o \
         monodll_intl.o \
         monodll_ipcbase.o \
         monodll_init.o \
         monodll_intl.o \
         monodll_ipcbase.o \
+       monodll_languageinfo.o \
         monodll_list.o \
         monodll_log.o \
         monodll_longlong.o \
         monodll_list.o \
         monodll_log.o \
         monodll_longlong.o \
@@ -872,6 +962,7 @@ MONODLL_OBJECTS =  \
         monodll_mimecmn.o \
         monodll_module.o \
         monodll_mstream.o \
         monodll_mimecmn.o \
         monodll_module.o \
         monodll_mstream.o \
+       monodll_numformatter.o \
         monodll_object.o \
         monodll_platinfo.o \
         monodll_powercmn.o \
         monodll_object.o \
         monodll_platinfo.o \
         monodll_powercmn.o \
@@ -879,6 +970,7 @@ MONODLL_OBJECTS =  \
         monodll_regex.o \
         monodll_stdpbase.o \
         monodll_sstream.o \
         monodll_regex.o \
         monodll_stdpbase.o \
         monodll_sstream.o \
+       monodll_stdstream.o \
         monodll_stopwatch.o \
         monodll_strconv.o \
         monodll_stream.o \
         monodll_stopwatch.o \
         monodll_strconv.o \
         monodll_stream.o \
@@ -893,6 +985,7 @@ MONODLL_OBJECTS =  \
         monodll_timercmn.o \
         monodll_timerimpl.o \
         monodll_tokenzr.o \
         monodll_timercmn.o \
         monodll_timerimpl.o \
         monodll_tokenzr.o \
+       monodll_translation.o \
         monodll_txtstrm.o \
         monodll_unichar.o \
         monodll_uri.o \
         monodll_txtstrm.o \
         monodll_unichar.o \
         monodll_uri.o \
@@ -906,6 +999,8 @@ MONODLL_OBJECTS =  \
         monodll_xtistrm.o \
         monodll_zipstrm.o \
         monodll_zstream.o \
         monodll_xtistrm.o \
         monodll_zipstrm.o \
         monodll_zstream.o \
+       monodll_fswatchercmn.o \
+       monodll_fswatcherg.o \
         $(__BASE_PLATFORM_SRC_OBJECTS) \
         monodll_event.o \
         monodll_fs_mem.o \
         $(__BASE_PLATFORM_SRC_OBJECTS) \
         monodll_event.o \
         monodll_fs_mem.o \
@@ -929,22 +1024,32 @@ MONODLL_OBJECTS =  \
         monodll_xtixml.o \
         $(__PLUGIN_ADV_SRC_OBJECTS) \
         $(__monodll___win32rc)
         monodll_xtixml.o \
         $(__PLUGIN_ADV_SRC_OBJECTS) \
         $(__monodll___win32rc)
-MONODLL_ODEP =  $(___pch_wxprec_monodll_wx_wxprec_h_gch___depname)
+MONODLL_ODEP =  $(_____pch_wxprec_monodll_wx_wxprec_h_gch___depname)
  MONOLIB_CFLAGS = $(__monolib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
  MONOLIB_CFLAGS = $(__monolib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       -DwxUSE_BASE=1 -I$(top_srcdir)/src/stc/scintilla/include \
-       -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
-       $(CPPFLAGS) $(CFLAGS)
-MONOLIB_CXXFLAGS = $(__monolib_PCH_INC) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
         $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
         $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
         $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
         $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) -DwxUSE_BASE=1 -I$(top_srcdir)/src/stc/scintilla/include \
+       $(__INC_EXPAT_p) -I$(top_srcdir)/src/stc/scintilla/include \
         -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
         -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
-       $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
+MONOLIB_CXXFLAGS = $(__monolib_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -I$(top_srcdir)/src/stc/scintilla/include \
+       -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
+       -DwxUSE_BASE=1 $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+MONOLIB_OBJCXXFLAGS = $(__monolib_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -I$(top_srcdir)/src/stc/scintilla/include \
+       -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
+       -DwxUSE_BASE=1 $(CPPFLAGS) $(OBJCXXFLAGS)
  MONOLIB_OBJECTS =  \
  MONOLIB_OBJECTS =  \
+       monolib_any.o \
         monolib_appbase.o \
         monolib_arcall.o \
         monolib_arcfind.o \
         monolib_appbase.o \
         monolib_arcall.o \
         monolib_arcfind.o \
@@ -956,6 +1061,7 @@ MONOLIB_OBJECTS =  \
         monolib_config.o \
         monolib_convauto.o \
         monolib_datetime.o \
         monolib_config.o \
         monolib_convauto.o \
         monolib_datetime.o \
+       monolib_datetimefmt.o \
         monolib_datstrm.o \
         monolib_dircmn.o \
         monolib_dynarray.o \
         monolib_datstrm.o \
         monolib_dircmn.o \
         monolib_dynarray.o \
@@ -981,6 +1087,7 @@ MONOLIB_OBJECTS =  \
         monolib_init.o \
         monolib_intl.o \
         monolib_ipcbase.o \
         monolib_init.o \
         monolib_intl.o \
         monolib_ipcbase.o \
+       monolib_languageinfo.o \
         monolib_list.o \
         monolib_log.o \
         monolib_longlong.o \
         monolib_list.o \
         monolib_log.o \
         monolib_longlong.o \
@@ -988,6 +1095,7 @@ MONOLIB_OBJECTS =  \
         monolib_mimecmn.o \
         monolib_module.o \
         monolib_mstream.o \
         monolib_mimecmn.o \
         monolib_module.o \
         monolib_mstream.o \
+       monolib_numformatter.o \
         monolib_object.o \
         monolib_platinfo.o \
         monolib_powercmn.o \
         monolib_object.o \
         monolib_platinfo.o \
         monolib_powercmn.o \
@@ -995,6 +1103,7 @@ MONOLIB_OBJECTS =  \
         monolib_regex.o \
         monolib_stdpbase.o \
         monolib_sstream.o \
         monolib_regex.o \
         monolib_stdpbase.o \
         monolib_sstream.o \
+       monolib_stdstream.o \
         monolib_stopwatch.o \
         monolib_strconv.o \
         monolib_stream.o \
         monolib_stopwatch.o \
         monolib_strconv.o \
         monolib_stream.o \
@@ -1009,6 +1118,7 @@ MONOLIB_OBJECTS =  \
         monolib_timercmn.o \
         monolib_timerimpl.o \
         monolib_tokenzr.o \
         monolib_timercmn.o \
         monolib_timerimpl.o \
         monolib_tokenzr.o \
+       monolib_translation.o \
         monolib_txtstrm.o \
         monolib_unichar.o \
         monolib_uri.o \
         monolib_txtstrm.o \
         monolib_unichar.o \
         monolib_uri.o \
@@ -1022,6 +1132,8 @@ MONOLIB_OBJECTS =  \
         monolib_xtistrm.o \
         monolib_zipstrm.o \
         monolib_zstream.o \
         monolib_xtistrm.o \
         monolib_zipstrm.o \
         monolib_zstream.o \
+       monolib_fswatchercmn.o \
+       monolib_fswatcherg.o \
         $(__BASE_PLATFORM_SRC_OBJECTS_1) \
         monolib_event.o \
         monolib_fs_mem.o \
         $(__BASE_PLATFORM_SRC_OBJECTS_1) \
         monolib_event.o \
         monolib_fs_mem.o \
@@ -1044,21 +1156,28 @@ MONOLIB_OBJECTS =  \
         monolib_xml.o \
         monolib_xtixml.o \
         $(__PLUGIN_ADV_SRC_OBJECTS_1)
         monolib_xml.o \
         monolib_xtixml.o \
         $(__PLUGIN_ADV_SRC_OBJECTS_1)
-MONOLIB_ODEP =  $(___pch_wxprec_monolib_wx_wxprec_h_gch___depname)
+MONOLIB_ODEP =  $(_____pch_wxprec_monolib_wx_wxprec_h_gch___depname)
  BASEDLL_CFLAGS = $(__basedll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
  BASEDLL_CFLAGS = $(__basedll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 $(PIC_FLAG) $(CPPFLAGS) \
-       $(CFLAGS)
-BASEDLL_CXXFLAGS = $(__basedll_PCH_INC) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
         $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
         $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
         $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 $(PIC_FLAG) \
         $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
         $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
         $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 $(PIC_FLAG) \
-       $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(CPPFLAGS) $(CFLAGS)
+BASEDLL_CXXFLAGS = $(__basedll_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE \
+       -DwxUSE_BASE=1 $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+BASEDLL_OBJCXXFLAGS = $(__basedll_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE \
+       -DwxUSE_BASE=1 $(PIC_FLAG) $(CPPFLAGS) $(OBJCXXFLAGS)
  BASEDLL_OBJECTS =  \
         $(__basedll___win32rc) \
  BASEDLL_OBJECTS =  \
         $(__basedll___win32rc) \
+       basedll_any.o \
         basedll_appbase.o \
         basedll_arcall.o \
         basedll_arcfind.o \
         basedll_appbase.o \
         basedll_arcall.o \
         basedll_arcfind.o \
@@ -1070,6 +1189,7 @@ BASEDLL_OBJECTS =  \
         basedll_config.o \
         basedll_convauto.o \
         basedll_datetime.o \
         basedll_config.o \
         basedll_convauto.o \
         basedll_datetime.o \
+       basedll_datetimefmt.o \
         basedll_datstrm.o \
         basedll_dircmn.o \
         basedll_dynarray.o \
         basedll_datstrm.o \
         basedll_dircmn.o \
         basedll_dynarray.o \
@@ -1095,6 +1215,7 @@ BASEDLL_OBJECTS =  \
         basedll_init.o \
         basedll_intl.o \
         basedll_ipcbase.o \
         basedll_init.o \
         basedll_intl.o \
         basedll_ipcbase.o \
+       basedll_languageinfo.o \
         basedll_list.o \
         basedll_log.o \
         basedll_longlong.o \
         basedll_list.o \
         basedll_log.o \
         basedll_longlong.o \
@@ -1102,6 +1223,7 @@ BASEDLL_OBJECTS =  \
         basedll_mimecmn.o \
         basedll_module.o \
         basedll_mstream.o \
         basedll_mimecmn.o \
         basedll_module.o \
         basedll_mstream.o \
+       basedll_numformatter.o \
         basedll_object.o \
         basedll_platinfo.o \
         basedll_powercmn.o \
         basedll_object.o \
         basedll_platinfo.o \
         basedll_powercmn.o \
@@ -1109,6 +1231,7 @@ BASEDLL_OBJECTS =  \
         basedll_regex.o \
         basedll_stdpbase.o \
         basedll_sstream.o \
         basedll_regex.o \
         basedll_stdpbase.o \
         basedll_sstream.o \
+       basedll_stdstream.o \
         basedll_stopwatch.o \
         basedll_strconv.o \
         basedll_stream.o \
         basedll_stopwatch.o \
         basedll_strconv.o \
         basedll_stream.o \
@@ -1123,6 +1246,7 @@ BASEDLL_OBJECTS =  \
         basedll_timercmn.o \
         basedll_timerimpl.o \
         basedll_tokenzr.o \
         basedll_timercmn.o \
         basedll_timerimpl.o \
         basedll_tokenzr.o \
+       basedll_translation.o \
         basedll_txtstrm.o \
         basedll_unichar.o \
         basedll_uri.o \
         basedll_txtstrm.o \
         basedll_unichar.o \
         basedll_uri.o \
@@ -1136,6 +1260,8 @@ BASEDLL_OBJECTS =  \
         basedll_xtistrm.o \
         basedll_zipstrm.o \
         basedll_zstream.o \
         basedll_xtistrm.o \
         basedll_zipstrm.o \
         basedll_zstream.o \
+       basedll_fswatchercmn.o \
+       basedll_fswatcherg.o \
         $(__BASE_PLATFORM_SRC_OBJECTS_2) \
         basedll_event.o \
         basedll_fs_mem.o \
         $(__BASE_PLATFORM_SRC_OBJECTS_2) \
         basedll_event.o \
         basedll_fs_mem.o \
@@ -1143,19 +1269,26 @@ BASEDLL_OBJECTS =  \
         basedll_utilscmn.o \
         $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2) \
         $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_2)
         basedll_utilscmn.o \
         $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2) \
         $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_2)
-BASEDLL_ODEP =  $(___pch_wxprec_basedll_wx_wxprec_h_gch___depname)
+BASEDLL_ODEP =  $(_____pch_wxprec_basedll_wx_wxprec_h_gch___depname)
  BASELIB_CFLAGS = $(__baselib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
  BASELIB_CFLAGS = $(__baselib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
-BASELIB_CXXFLAGS = $(__baselib_PCH_INC) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
         $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
         $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
         $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
         $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CXXWARNINGS) $(CPPFLAGS) \
-       $(CXXFLAGS)
+       $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
+BASELIB_CXXFLAGS = $(__baselib_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DwxUSE_BASE=1 \
+       $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+BASELIB_OBJCXXFLAGS = $(__baselib_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) \
+       $(OBJCXXFLAGS)
  BASELIB_OBJECTS =  \
  BASELIB_OBJECTS =  \
+       baselib_any.o \
         baselib_appbase.o \
         baselib_arcall.o \
         baselib_arcfind.o \
         baselib_appbase.o \
         baselib_arcall.o \
         baselib_arcfind.o \
@@ -1167,6 +1300,7 @@ BASELIB_OBJECTS =  \
         baselib_config.o \
         baselib_convauto.o \
         baselib_datetime.o \
         baselib_config.o \
         baselib_convauto.o \
         baselib_datetime.o \
+       baselib_datetimefmt.o \
         baselib_datstrm.o \
         baselib_dircmn.o \
         baselib_dynarray.o \
         baselib_datstrm.o \
         baselib_dircmn.o \
         baselib_dynarray.o \
@@ -1192,6 +1326,7 @@ BASELIB_OBJECTS =  \
         baselib_init.o \
         baselib_intl.o \
         baselib_ipcbase.o \
         baselib_init.o \
         baselib_intl.o \
         baselib_ipcbase.o \
+       baselib_languageinfo.o \
         baselib_list.o \
         baselib_log.o \
         baselib_longlong.o \
         baselib_list.o \
         baselib_log.o \
         baselib_longlong.o \
@@ -1199,6 +1334,7 @@ BASELIB_OBJECTS =  \
         baselib_mimecmn.o \
         baselib_module.o \
         baselib_mstream.o \
         baselib_mimecmn.o \
         baselib_module.o \
         baselib_mstream.o \
+       baselib_numformatter.o \
         baselib_object.o \
         baselib_platinfo.o \
         baselib_powercmn.o \
         baselib_object.o \
         baselib_platinfo.o \
         baselib_powercmn.o \
@@ -1206,6 +1342,7 @@ BASELIB_OBJECTS =  \
         baselib_regex.o \
         baselib_stdpbase.o \
         baselib_sstream.o \
         baselib_regex.o \
         baselib_stdpbase.o \
         baselib_sstream.o \
+       baselib_stdstream.o \
         baselib_stopwatch.o \
         baselib_strconv.o \
         baselib_stream.o \
         baselib_stopwatch.o \
         baselib_strconv.o \
         baselib_stream.o \
@@ -1220,6 +1357,7 @@ BASELIB_OBJECTS =  \
         baselib_timercmn.o \
         baselib_timerimpl.o \
         baselib_tokenzr.o \
         baselib_timercmn.o \
         baselib_timerimpl.o \
         baselib_tokenzr.o \
+       baselib_translation.o \
         baselib_txtstrm.o \
         baselib_unichar.o \
         baselib_uri.o \
         baselib_txtstrm.o \
         baselib_unichar.o \
         baselib_uri.o \
@@ -1233,6 +1371,8 @@ BASELIB_OBJECTS =  \
         baselib_xtistrm.o \
         baselib_zipstrm.o \
         baselib_zstream.o \
         baselib_xtistrm.o \
         baselib_zipstrm.o \
         baselib_zstream.o \
+       baselib_fswatchercmn.o \
+       baselib_fswatcherg.o \
         $(__BASE_PLATFORM_SRC_OBJECTS_3) \
         baselib_event.o \
         baselib_fs_mem.o \
         $(__BASE_PLATFORM_SRC_OBJECTS_3) \
         baselib_event.o \
         baselib_fs_mem.o \
@@ -1240,13 +1380,13 @@ BASELIB_OBJECTS =  \
         baselib_utilscmn.o \
         $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3) \
         $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3)
         baselib_utilscmn.o \
         $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3) \
         $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3)
-BASELIB_ODEP =  $(___pch_wxprec_baselib_wx_wxprec_h_gch___depname)
+BASELIB_ODEP =  $(_____pch_wxprec_baselib_wx_wxprec_h_gch___depname)
  NETDLL_CXXFLAGS = $(__netdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
  NETDLL_CXXFLAGS = $(__netdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET $(PIC_FLAG) $(CXXWARNINGS) \
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET $(PIC_FLAG) \
+       $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
  NETDLL_OBJECTS =  \
         $(__netdll___win32rc) \
         netdll_fs_inet.o \
  NETDLL_OBJECTS =  \
         $(__netdll___win32rc) \
         netdll_fs_inet.o \
@@ -1260,12 +1400,12 @@ NETDLL_OBJECTS =  \
         netdll_socket.o \
         netdll_url.o \
         $(__NET_PLATFORM_SRC_OBJECTS_2)
         netdll_socket.o \
         netdll_url.o \
         $(__NET_PLATFORM_SRC_OBJECTS_2)
-NETDLL_ODEP =  $(___pch_wxprec_netdll_wx_wxprec_h_gch___depname)
+NETDLL_ODEP =  $(_____pch_wxprec_netdll_wx_wxprec_h_gch___depname)
  NETLIB_CXXFLAGS = $(__netlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
  NETLIB_CXXFLAGS = $(__netlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       -DwxUSE_GUI=0 $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
  NETLIB_OBJECTS =  \
         netlib_fs_inet.o \
         netlib_ftp.o \
  NETLIB_OBJECTS =  \
         netlib_fs_inet.o \
         netlib_ftp.o \
@@ -1278,19 +1418,25 @@ NETLIB_OBJECTS =  \
         netlib_socket.o \
         netlib_url.o \
         $(__NET_PLATFORM_SRC_OBJECTS_3)
         netlib_socket.o \
         netlib_url.o \
         $(__NET_PLATFORM_SRC_OBJECTS_3)
-NETLIB_ODEP =  $(___pch_wxprec_netlib_wx_wxprec_h_gch___depname)
+NETLIB_ODEP =  $(_____pch_wxprec_netlib_wx_wxprec_h_gch___depname)
  COREDLL_CFLAGS = $(__coredll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
  COREDLL_CFLAGS = $(__coredll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(PIC_FLAG) $(CPPFLAGS) \
-       $(CFLAGS)
-COREDLL_CXXFLAGS = $(__coredll_PCH_INC) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
         $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
         $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
         $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(PIC_FLAG) \
         $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
         $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
         $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(PIC_FLAG) \
-       $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(CPPFLAGS) $(CFLAGS)
+COREDLL_CXXFLAGS = $(__coredll_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_CORE \
+       -DwxUSE_BASE=0 $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+COREDLL_OBJCXXFLAGS = $(__coredll_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_CORE \
+       -DwxUSE_BASE=0 $(PIC_FLAG) $(CPPFLAGS) $(OBJCXXFLAGS)
  COREDLL_OBJECTS =  \
         $(__coredll___win32rc) \
         coredll_event.o \
  COREDLL_OBJECTS =  \
         $(__coredll___win32rc) \
         coredll_event.o \
@@ -1300,17 +1446,23 @@ COREDLL_OBJECTS =  \
         $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4) \
         $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4) \
         $(__CORE_SRC_OBJECTS_2)
         $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4) \
         $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4) \
         $(__CORE_SRC_OBJECTS_2)
-COREDLL_ODEP =  $(___pch_wxprec_coredll_wx_wxprec_h_gch___depname)
+COREDLL_ODEP =  $(_____pch_wxprec_coredll_wx_wxprec_h_gch___depname)
  CORELIB_CFLAGS = $(__corelib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
  CORELIB_CFLAGS = $(__corelib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       -DwxUSE_BASE=0 $(CPPFLAGS) $(CFLAGS)
-CORELIB_CXXFLAGS = $(__corelib_PCH_INC) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
         $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
         $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
         $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
         $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) -DwxUSE_BASE=0 $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__INC_EXPAT_p) -DwxUSE_BASE=0 $(CPPFLAGS) $(CFLAGS)
+CORELIB_CXXFLAGS = $(__corelib_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=0 $(CXXWARNINGS) $(CPPFLAGS) \
+       $(CXXFLAGS)
+CORELIB_OBJCXXFLAGS = $(__corelib_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=0 $(CPPFLAGS) $(OBJCXXFLAGS)
  CORELIB_OBJECTS =  \
         corelib_event.o \
         corelib_fs_mem.o \
  CORELIB_OBJECTS =  \
         corelib_event.o \
         corelib_fs_mem.o \
@@ -1319,63 +1471,86 @@ CORELIB_OBJECTS =  \
         $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5) \
         $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5) \
         $(__CORE_SRC_OBJECTS_3)
         $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5) \
         $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5) \
         $(__CORE_SRC_OBJECTS_3)
-CORELIB_ODEP =  $(___pch_wxprec_corelib_wx_wxprec_h_gch___depname)
+CORELIB_ODEP =  $(_____pch_wxprec_corelib_wx_wxprec_h_gch___depname)
  ADVDLL_CFLAGS = $(__advdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
  ADVDLL_CFLAGS = $(__advdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       -DWXUSINGDLL -DWXMAKINGDLL_ADV $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS)
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_ADV $(PIC_FLAG) $(CPPFLAGS) \
+       $(CFLAGS)
  ADVDLL_CXXFLAGS = $(__advdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
  ADVDLL_CXXFLAGS = $(__advdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       -DWXUSINGDLL -DWXMAKINGDLL_ADV $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) \
-       $(CXXFLAGS)
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_ADV $(PIC_FLAG) $(CXXWARNINGS) \
+       $(CPPFLAGS) $(CXXFLAGS)
+ADVDLL_OBJCXXFLAGS = $(__advdll_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_ADV $(PIC_FLAG) \
+       $(CPPFLAGS) $(OBJCXXFLAGS)
  ADVDLL_OBJECTS =  \
         $(__advdll___win32rc) \
         $(__ADVANCED_SRC_OBJECTS_2) \
         $(__PLUGIN_ADV_SRC_OBJECTS_2)
  ADVDLL_OBJECTS =  \
         $(__advdll___win32rc) \
         $(__ADVANCED_SRC_OBJECTS_2) \
         $(__PLUGIN_ADV_SRC_OBJECTS_2)
-ADVDLL_ODEP =  $(___pch_wxprec_advdll_wx_wxprec_h_gch___depname)
+ADVDLL_ODEP =  $(_____pch_wxprec_advdll_wx_wxprec_h_gch___depname)
  ADVLIB_CFLAGS = $(__advlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
  ADVLIB_CFLAGS = $(__advlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) \
-       $(CFLAGS)
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) $(CPPFLAGS) $(CFLAGS)
  ADVLIB_CXXFLAGS = $(__advlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
  ADVLIB_CXXFLAGS = $(__advlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+ADVLIB_OBJCXXFLAGS = $(__advlib_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(OBJCXXFLAGS)
  ADVLIB_OBJECTS =  \
         $(__ADVANCED_SRC_OBJECTS_3) \
         $(__PLUGIN_ADV_SRC_OBJECTS_3)
  ADVLIB_OBJECTS =  \
         $(__ADVANCED_SRC_OBJECTS_3) \
         $(__PLUGIN_ADV_SRC_OBJECTS_3)
-ADVLIB_ODEP =  $(___pch_wxprec_advlib_wx_wxprec_h_gch___depname)
+ADVLIB_ODEP =  $(_____pch_wxprec_advlib_wx_wxprec_h_gch___depname)
  MEDIADLL_CXXFLAGS = $(__mediadll_PCH_INC) -D__WX$(TOOLKIT)__ \
  MEDIADLL_CXXFLAGS = $(__mediadll_PCH_INC) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_MEDIA $(PIC_FLAG) $(CXXWARNINGS) \
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_MEDIA \
+       $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+MEDIADLL_OBJCXXFLAGS = $(__mediadll_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_MEDIA \
+       $(PIC_FLAG) $(CPPFLAGS) $(OBJCXXFLAGS)
  MEDIADLL_OBJECTS =  \
         $(__mediadll___win32rc) \
         mediadll_mediactrlcmn.o \
         $(__MEDIA_PLATFORM_SRC_OBJECTS_2)
  MEDIADLL_OBJECTS =  \
         $(__mediadll___win32rc) \
         mediadll_mediactrlcmn.o \
         $(__MEDIA_PLATFORM_SRC_OBJECTS_2)
-MEDIADLL_ODEP =  $(___pch_wxprec_mediadll_wx_wxprec_h_gch___depname)
+MEDIADLL_ODEP =  $(_____pch_wxprec_mediadll_wx_wxprec_h_gch___depname)
  MEDIALIB_CXXFLAGS = $(__medialib_PCH_INC) -D__WX$(TOOLKIT)__ \
  MEDIALIB_CXXFLAGS = $(__medialib_PCH_INC) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+MEDIALIB_OBJCXXFLAGS = $(__medialib_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(OBJCXXFLAGS)
  MEDIALIB_OBJECTS =  \
         medialib_mediactrlcmn.o \
         $(__MEDIA_PLATFORM_SRC_OBJECTS_3)
  MEDIALIB_OBJECTS =  \
         medialib_mediactrlcmn.o \
         $(__MEDIA_PLATFORM_SRC_OBJECTS_3)
-MEDIALIB_ODEP =  $(___pch_wxprec_medialib_wx_wxprec_h_gch___depname)
+MEDIALIB_ODEP =  $(_____pch_wxprec_medialib_wx_wxprec_h_gch___depname)
  HTMLDLL_CXXFLAGS = $(__htmldll_PCH_INC) -D__WX$(TOOLKIT)__ \
  HTMLDLL_CXXFLAGS = $(__htmldll_PCH_INC) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_HTML $(PIC_FLAG) $(CXXWARNINGS) \
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_HTML \
+       $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
  HTMLDLL_OBJECTS =  \
         $(__htmldll___win32rc) \
         $(__HTML_SRC_PLATFORM_OBJECTS_2) \
  HTMLDLL_OBJECTS =  \
         $(__htmldll___win32rc) \
         $(__HTML_SRC_PLATFORM_OBJECTS_2) \
@@ -1398,16 +1573,18 @@ HTMLDLL_OBJECTS =  \
         htmldll_m_links.o \
         htmldll_m_list.o \
         htmldll_m_pre.o \
         htmldll_m_links.o \
         htmldll_m_list.o \
         htmldll_m_pre.o \
+       htmldll_m_span.o \
         htmldll_m_style.o \
         htmldll_m_tables.o \
         htmldll_m_style.o \
         htmldll_m_tables.o \
+       htmldll_styleparams.o \
         htmldll_winpars.o \
         htmldll_htmllbox.o
         htmldll_winpars.o \
         htmldll_htmllbox.o
-HTMLDLL_ODEP =  $(___pch_wxprec_htmldll_wx_wxprec_h_gch___depname)
+HTMLDLL_ODEP =  $(_____pch_wxprec_htmldll_wx_wxprec_h_gch___depname)
  HTMLLIB_CXXFLAGS = $(__htmllib_PCH_INC) -D__WX$(TOOLKIT)__ \
  HTMLLIB_CXXFLAGS = $(__htmllib_PCH_INC) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
  HTMLLIB_OBJECTS =  \
         $(__HTML_SRC_PLATFORM_OBJECTS_3) \
         htmllib_helpctrl.o \
  HTMLLIB_OBJECTS =  \
         $(__HTML_SRC_PLATFORM_OBJECTS_3) \
         htmllib_helpctrl.o \
@@ -1429,60 +1606,96 @@ HTMLLIB_OBJECTS =  \
         htmllib_m_links.o \
         htmllib_m_list.o \
         htmllib_m_pre.o \
         htmllib_m_links.o \
         htmllib_m_list.o \
         htmllib_m_pre.o \
+       htmllib_m_span.o \
         htmllib_m_style.o \
         htmllib_m_tables.o \
         htmllib_m_style.o \
         htmllib_m_tables.o \
+       htmllib_styleparams.o \
         htmllib_winpars.o \
         htmllib_htmllbox.o
         htmllib_winpars.o \
         htmllib_htmllbox.o
-HTMLLIB_ODEP =  $(___pch_wxprec_htmllib_wx_wxprec_h_gch___depname)
+HTMLLIB_ODEP =  $(_____pch_wxprec_htmllib_wx_wxprec_h_gch___depname)
+WEBVIEWDLL_CXXFLAGS = $(__webviewdll_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_WEBVIEW \
+       $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+WEBVIEWDLL_OBJCXXFLAGS = $(__webviewdll_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_WEBVIEW \
+       $(PIC_FLAG) $(CPPFLAGS) $(OBJCXXFLAGS)
+WEBVIEWDLL_OBJECTS =  \
+       $(__webviewdll___win32rc) \
+       $(__WEBVIEW_SRC_PLATFORM_OBJECTS_2) \
+       webviewdll_webview.o \
+       webviewdll_webviewarchivehandler.o
+WEBVIEWDLL_ODEP =  $(_____pch_wxprec_webviewdll_wx_wxprec_h_gch___depname)
+WEBVIEWLIB_CXXFLAGS = $(__webviewlib_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+WEBVIEWLIB_OBJCXXFLAGS = $(__webviewlib_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(OBJCXXFLAGS)
+WEBVIEWLIB_OBJECTS =  \
+       $(__WEBVIEW_SRC_PLATFORM_OBJECTS_3) \
+       webviewlib_webview.o \
+       webviewlib_webviewarchivehandler.o
+WEBVIEWLIB_ODEP =  $(_____pch_wxprec_webviewlib_wx_wxprec_h_gch___depname)
  QADLL_CXXFLAGS = $(__qadll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
  QADLL_CXXFLAGS = $(__qadll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       -DWXUSINGDLL -DWXMAKINGDLL_QA $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) \
-       $(CXXFLAGS)
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_QA $(PIC_FLAG) $(CXXWARNINGS) \
+       $(CPPFLAGS) $(CXXFLAGS)
  QADLL_OBJECTS =  \
         $(__qadll___win32rc) \
         qadll_debugrpt.o \
         qadll_dbgrptg.o
  QADLL_OBJECTS =  \
         $(__qadll___win32rc) \
         qadll_debugrpt.o \
         qadll_dbgrptg.o
-QADLL_ODEP =  $(___pch_wxprec_qadll_wx_wxprec_h_gch___depname)
+QADLL_ODEP =  $(_____pch_wxprec_qadll_wx_wxprec_h_gch___depname)
  QALIB_CXXFLAGS = $(__qalib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
  QALIB_CXXFLAGS = $(__qalib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
  QALIB_OBJECTS =  \
         qalib_debugrpt.o \
         qalib_dbgrptg.o
  QALIB_OBJECTS =  \
         qalib_debugrpt.o \
         qalib_dbgrptg.o
-QALIB_ODEP =  $(___pch_wxprec_qalib_wx_wxprec_h_gch___depname)
+QALIB_ODEP =  $(_____pch_wxprec_qalib_wx_wxprec_h_gch___depname)
  XMLDLL_CXXFLAGS = $(__xmldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
  XMLDLL_CXXFLAGS = $(__xmldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_XML $(PIC_FLAG) $(CXXWARNINGS) \
-       $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_XML $(PIC_FLAG) \
+       $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
  XMLDLL_OBJECTS =  \
         $(__xmldll___win32rc) \
         xmldll_xml.o \
         xmldll_xtixml.o
  XMLDLL_OBJECTS =  \
         $(__xmldll___win32rc) \
         xmldll_xml.o \
         xmldll_xtixml.o
-XMLDLL_ODEP =  $(___pch_wxprec_xmldll_wx_wxprec_h_gch___depname)
+XMLDLL_ODEP =  $(_____pch_wxprec_xmldll_wx_wxprec_h_gch___depname)
  XMLLIB_CXXFLAGS = $(__xmllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
  XMLLIB_CXXFLAGS = $(__xmllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       -DwxUSE_GUI=0 $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
  XMLLIB_OBJECTS =  \
         xmllib_xml.o \
         xmllib_xtixml.o
  XMLLIB_OBJECTS =  \
         xmllib_xml.o \
         xmllib_xtixml.o
-XMLLIB_ODEP =  $(___pch_wxprec_xmllib_wx_wxprec_h_gch___depname)
+XMLLIB_ODEP =  $(_____pch_wxprec_xmllib_wx_wxprec_h_gch___depname)
  XRCDLL_CXXFLAGS = $(__xrcdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
  XRCDLL_CXXFLAGS = $(__xrcdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       -DWXUSINGDLL -DWXMAKINGDLL_XRC $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) \
-       $(CXXFLAGS)
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_XRC $(PIC_FLAG) $(CXXWARNINGS) \
+       $(CPPFLAGS) $(CXXFLAGS)
  XRCDLL_OBJECTS =  \
         $(__xrcdll___win32rc) \
         xrcdll_xh_animatctrl.o \
  XRCDLL_OBJECTS =  \
         $(__xrcdll___win32rc) \
         xrcdll_xh_animatctrl.o \
+       xrcdll_xh_bannerwindow.o \
         xrcdll_xh_bmp.o \
         xrcdll_xh_bmpcbox.o \
         xrcdll_xh_bmpbt.o \
         xrcdll_xh_bmp.o \
         xrcdll_xh_bmpcbox.o \
         xrcdll_xh_bmpbt.o \
@@ -1493,15 +1706,18 @@ XRCDLL_OBJECTS =  \
         xrcdll_xh_choic.o \
         xrcdll_xh_choicbk.o \
         xrcdll_xh_clrpicker.o \
         xrcdll_xh_choic.o \
         xrcdll_xh_choicbk.o \
         xrcdll_xh_clrpicker.o \
+       xrcdll_xh_cmdlinkbn.o \
         xrcdll_xh_collpane.o \
         xrcdll_xh_combo.o \
         xrcdll_xh_collpane.o \
         xrcdll_xh_combo.o \
+       xrcdll_xh_comboctrl.o \
         xrcdll_xh_datectrl.o \
         xrcdll_xh_dirpicker.o \
         xrcdll_xh_dlg.o \
         xrcdll_xh_datectrl.o \
         xrcdll_xh_dirpicker.o \
         xrcdll_xh_dlg.o \
-       xrcdll_xh_frame.o \
-       xrcdll_xh_mdi.o \
+       xrcdll_xh_editlbox.o \
+       xrcdll_xh_filectrl.o \
         xrcdll_xh_filepicker.o \
         xrcdll_xh_fontpicker.o \
         xrcdll_xh_filepicker.o \
         xrcdll_xh_fontpicker.o \
+       xrcdll_xh_frame.o \
         xrcdll_xh_gauge.o \
         xrcdll_xh_gdctl.o \
         xrcdll_xh_grid.o \
         xrcdll_xh_gauge.o \
         xrcdll_xh_gdctl.o \
         xrcdll_xh_grid.o \
@@ -1510,6 +1726,7 @@ XRCDLL_OBJECTS =  \
         xrcdll_xh_listb.o \
         xrcdll_xh_listbk.o \
         xrcdll_xh_listc.o \
         xrcdll_xh_listb.o \
         xrcdll_xh_listbk.o \
         xrcdll_xh_listc.o \
+       xrcdll_xh_mdi.o \
         xrcdll_xh_menu.o \
         xrcdll_xh_notbk.o \
         xrcdll_xh_odcombo.o \
         xrcdll_xh_menu.o \
         xrcdll_xh_notbk.o \
         xrcdll_xh_odcombo.o \
@@ -1533,6 +1750,7 @@ XRCDLL_OBJECTS =  \
         xrcdll_xh_text.o \
         xrcdll_xh_tglbtn.o \
         xrcdll_xh_toolb.o \
         xrcdll_xh_text.o \
         xrcdll_xh_tglbtn.o \
         xrcdll_xh_toolb.o \
+       xrcdll_xh_toolbk.o \
         xrcdll_xh_tree.o \
         xrcdll_xh_treebk.o \
         xrcdll_xh_unkwn.o \
         xrcdll_xh_tree.o \
         xrcdll_xh_treebk.o \
         xrcdll_xh_unkwn.o \
@@ -1540,14 +1758,15 @@ XRCDLL_OBJECTS =  \
         xrcdll_xmlres.o \
         xrcdll_xmladv.o \
         xrcdll_xmlrsall.o
         xrcdll_xmlres.o \
         xrcdll_xmladv.o \
         xrcdll_xmlrsall.o
-XRCDLL_ODEP =  $(___pch_wxprec_xrcdll_wx_wxprec_h_gch___depname)
+XRCDLL_ODEP =  $(_____pch_wxprec_xrcdll_wx_wxprec_h_gch___depname)
  XRCLIB_CXXFLAGS = $(__xrclib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
  XRCLIB_CXXFLAGS = $(__xrclib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
  XRCLIB_OBJECTS =  \
         xrclib_xh_animatctrl.o \
  XRCLIB_OBJECTS =  \
         xrclib_xh_animatctrl.o \
+       xrclib_xh_bannerwindow.o \
         xrclib_xh_bmp.o \
         xrclib_xh_bmpcbox.o \
         xrclib_xh_bmpbt.o \
         xrclib_xh_bmp.o \
         xrclib_xh_bmpcbox.o \
         xrclib_xh_bmpbt.o \
@@ -1558,15 +1777,18 @@ XRCLIB_OBJECTS =  \
         xrclib_xh_choic.o \
         xrclib_xh_choicbk.o \
         xrclib_xh_clrpicker.o \
         xrclib_xh_choic.o \
         xrclib_xh_choicbk.o \
         xrclib_xh_clrpicker.o \
+       xrclib_xh_cmdlinkbn.o \
         xrclib_xh_collpane.o \
         xrclib_xh_combo.o \
         xrclib_xh_collpane.o \
         xrclib_xh_combo.o \
+       xrclib_xh_comboctrl.o \
         xrclib_xh_datectrl.o \
         xrclib_xh_dirpicker.o \
         xrclib_xh_dlg.o \
         xrclib_xh_datectrl.o \
         xrclib_xh_dirpicker.o \
         xrclib_xh_dlg.o \
-       xrclib_xh_frame.o \
-       xrclib_xh_mdi.o \
+       xrclib_xh_editlbox.o \
+       xrclib_xh_filectrl.o \
         xrclib_xh_filepicker.o \
         xrclib_xh_fontpicker.o \
         xrclib_xh_filepicker.o \
         xrclib_xh_fontpicker.o \
+       xrclib_xh_frame.o \
         xrclib_xh_gauge.o \
         xrclib_xh_gdctl.o \
         xrclib_xh_grid.o \
         xrclib_xh_gauge.o \
         xrclib_xh_gdctl.o \
         xrclib_xh_grid.o \
@@ -1575,6 +1797,7 @@ XRCLIB_OBJECTS =  \
         xrclib_xh_listb.o \
         xrclib_xh_listbk.o \
         xrclib_xh_listc.o \
         xrclib_xh_listb.o \
         xrclib_xh_listbk.o \
         xrclib_xh_listc.o \
+       xrclib_xh_mdi.o \
         xrclib_xh_menu.o \
         xrclib_xh_notbk.o \
         xrclib_xh_odcombo.o \
         xrclib_xh_menu.o \
         xrclib_xh_notbk.o \
         xrclib_xh_odcombo.o \
@@ -1598,6 +1821,7 @@ XRCLIB_OBJECTS =  \
         xrclib_xh_text.o \
         xrclib_xh_tglbtn.o \
         xrclib_xh_toolb.o \
         xrclib_xh_text.o \
         xrclib_xh_tglbtn.o \
         xrclib_xh_toolb.o \
+       xrclib_xh_toolbk.o \
         xrclib_xh_tree.o \
         xrclib_xh_treebk.o \
         xrclib_xh_unkwn.o \
         xrclib_xh_tree.o \
         xrclib_xh_treebk.o \
         xrclib_xh_unkwn.o \
@@ -1605,13 +1829,13 @@ XRCLIB_OBJECTS =  \
         xrclib_xmlres.o \
         xrclib_xmladv.o \
         xrclib_xmlrsall.o
         xrclib_xmlres.o \
         xrclib_xmladv.o \
         xrclib_xmlrsall.o
-XRCLIB_ODEP =  $(___pch_wxprec_xrclib_wx_wxprec_h_gch___depname)
+XRCLIB_ODEP =  $(_____pch_wxprec_xrclib_wx_wxprec_h_gch___depname)
  AUIDLL_CXXFLAGS = $(__auidll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
  AUIDLL_CXXFLAGS = $(__auidll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       -DWXUSINGDLL -DWXMAKINGDLL_AUI $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) \
-       $(CXXFLAGS)
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_AUI $(PIC_FLAG) $(CXXWARNINGS) \
+       $(CPPFLAGS) $(CXXFLAGS)
  AUIDLL_OBJECTS =  \
         $(__auidll___win32rc) \
         auidll_framemanager.o \
  AUIDLL_OBJECTS =  \
         $(__auidll___win32rc) \
         auidll_framemanager.o \
@@ -1620,12 +1844,12 @@ AUIDLL_OBJECTS =  \
         auidll_auibook.o \
         auidll_auibar.o \
         auidll_tabmdi.o
         auidll_auibook.o \
         auidll_auibar.o \
         auidll_tabmdi.o
-AUIDLL_ODEP =  $(___pch_wxprec_auidll_wx_wxprec_h_gch___depname)
+AUIDLL_ODEP =  $(_____pch_wxprec_auidll_wx_wxprec_h_gch___depname)
  AUILIB_CXXFLAGS = $(__auilib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
  AUILIB_CXXFLAGS = $(__auilib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
  AUILIB_OBJECTS =  \
         auilib_framemanager.o \
         auilib_dockart.o \
  AUILIB_OBJECTS =  \
         auilib_framemanager.o \
         auilib_dockart.o \
@@ -1633,46 +1857,116 @@ AUILIB_OBJECTS =  \
         auilib_auibook.o \
         auilib_auibar.o \
         auilib_tabmdi.o
         auilib_auibook.o \
         auilib_auibar.o \
         auilib_tabmdi.o
-AUILIB_ODEP =  $(___pch_wxprec_auilib_wx_wxprec_h_gch___depname)
+AUILIB_ODEP =  $(_____pch_wxprec_auilib_wx_wxprec_h_gch___depname)
+RIBBONDLL_CXXFLAGS = $(__ribbondll_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_RIBBON \
+       $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+RIBBONDLL_OBJECTS =  \
+       $(__ribbondll___win32rc) \
+       ribbondll_art_internal.o \
+       ribbondll_art_msw.o \
+       ribbondll_art_aui.o \
+       ribbondll_bar.o \
+       ribbondll_buttonbar.o \
+       ribbondll_control.o \
+       ribbondll_gallery.o \
+       ribbondll_page.o \
+       ribbondll_panel.o \
+       ribbondll_toolbar.o
+RIBBONDLL_ODEP =  $(_____pch_wxprec_ribbondll_wx_wxprec_h_gch___depname)
+RIBBONLIB_CXXFLAGS = $(__ribbonlib_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+RIBBONLIB_OBJECTS =  \
+       ribbonlib_art_internal.o \
+       ribbonlib_art_msw.o \
+       ribbonlib_art_aui.o \
+       ribbonlib_bar.o \
+       ribbonlib_buttonbar.o \
+       ribbonlib_control.o \
+       ribbonlib_gallery.o \
+       ribbonlib_page.o \
+       ribbonlib_panel.o \
+       ribbonlib_toolbar.o
+RIBBONLIB_ODEP =  $(_____pch_wxprec_ribbonlib_wx_wxprec_h_gch___depname)
+PROPGRIDDLL_CXXFLAGS = $(__propgriddll_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_PROPGRID \
+       $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+PROPGRIDDLL_OBJECTS =  \
+       $(__propgriddll___win32rc) \
+       propgriddll_advprops.o \
+       propgriddll_editors.o \
+       propgriddll_manager.o \
+       propgriddll_property.o \
+       propgriddll_propgrid.o \
+       propgriddll_propgridiface.o \
+       propgriddll_propgridpagestate.o \
+       propgriddll_props.o
+PROPGRIDDLL_ODEP = $(_____pch_wxprec_propgriddll_wx_wxprec_h_gch___depname)
+PROPGRIDLIB_CXXFLAGS = $(__propgridlib_PCH_INC) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+PROPGRIDLIB_OBJECTS =  \
+       propgridlib_advprops.o \
+       propgridlib_editors.o \
+       propgridlib_manager.o \
+       propgridlib_property.o \
+       propgridlib_propgrid.o \
+       propgridlib_propgridiface.o \
+       propgridlib_propgridpagestate.o \
+       propgridlib_props.o
+PROPGRIDLIB_ODEP = $(_____pch_wxprec_propgridlib_wx_wxprec_h_gch___depname)
  RICHTEXTDLL_CXXFLAGS = $(__richtextdll_PCH_INC) -D__WX$(TOOLKIT)__ \
  RICHTEXTDLL_CXXFLAGS = $(__richtextdll_PCH_INC) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_RICHTEXT $(PIC_FLAG) \
-       $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_RICHTEXT \
+       $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
  RICHTEXTDLL_OBJECTS =  \
         $(__richtextdll___win32rc) \
  RICHTEXTDLL_OBJECTS =  \
         $(__richtextdll___win32rc) \
-       richtextdll_richtextctrl.o \
         richtextdll_richtextbuffer.o \
         richtextdll_richtextbuffer.o \
-       richtextdll_richtextstyles.o \
-       richtextdll_richtextxml.o \
-       richtextdll_richtexthtml.o \
+       richtextdll_richtextctrl.o \
         richtextdll_richtextformatdlg.o \
         richtextdll_richtextformatdlg.o \
-       richtextdll_richtextsymboldlg.o \
+       richtextdll_richtexthtml.o \
+       richtextdll_richtextimagedlg.o \
+       richtextdll_richtextprint.o \
         richtextdll_richtextstyledlg.o \
         richtextdll_richtextstyledlg.o \
-       richtextdll_richtextprint.o
-RICHTEXTDLL_ODEP =  $(___pch_wxprec_richtextdll_wx_wxprec_h_gch___depname)
+       richtextdll_richtextstyles.o \
+       richtextdll_richtextsymboldlg.o \
+       richtextdll_richtextxml.o
+RICHTEXTDLL_ODEP = $(_____pch_wxprec_richtextdll_wx_wxprec_h_gch___depname)
  RICHTEXTLIB_CXXFLAGS = $(__richtextlib_PCH_INC) -D__WX$(TOOLKIT)__ \
  RICHTEXTLIB_CXXFLAGS = $(__richtextlib_PCH_INC) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
-       $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
  RICHTEXTLIB_OBJECTS =  \
  RICHTEXTLIB_OBJECTS =  \
-       richtextlib_richtextctrl.o \
         richtextlib_richtextbuffer.o \
         richtextlib_richtextbuffer.o \
-       richtextlib_richtextstyles.o \
-       richtextlib_richtextxml.o \
-       richtextlib_richtexthtml.o \
+       richtextlib_richtextctrl.o \
         richtextlib_richtextformatdlg.o \
         richtextlib_richtextformatdlg.o \
-       richtextlib_richtextsymboldlg.o \
+       richtextlib_richtexthtml.o \
+       richtextlib_richtextimagedlg.o \
+       richtextlib_richtextprint.o \
         richtextlib_richtextstyledlg.o \
         richtextlib_richtextstyledlg.o \
-       richtextlib_richtextprint.o
-RICHTEXTLIB_ODEP =  $(___pch_wxprec_richtextlib_wx_wxprec_h_gch___depname)
+       richtextlib_richtextstyles.o \
+       richtextlib_richtextsymboldlg.o \
+       richtextlib_richtextxml.o
+RICHTEXTLIB_ODEP = $(_____pch_wxprec_richtextlib_wx_wxprec_h_gch___depname)
  STCDLL_CXXFLAGS = $(__stcdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
  STCDLL_CXXFLAGS = $(__stcdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       -I$(top_srcdir)/src/stc/scintilla/include \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) -I$(top_srcdir)/src/stc/scintilla/include \
         -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
         -DWXUSINGDLL -DWXMAKINGDLL_STC $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) \
         $(CXXFLAGS)
         -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
         -DWXUSINGDLL -DWXMAKINGDLL_STC $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) \
         $(CXXFLAGS)
@@ -1681,39 +1975,50 @@ STCDLL_OBJECTS =  \
         stcdll_stc.o \
         stcdll_PlatWX.o \
         stcdll_ScintillaWX.o
         stcdll_stc.o \
         stcdll_PlatWX.o \
         stcdll_ScintillaWX.o
-STCDLL_ODEP =  $(___pch_wxprec_stcdll_wx_wxprec_h_gch___depname)
+STCDLL_ODEP =  $(_____pch_wxprec_stcdll_wx_wxprec_h_gch___depname)
  STCLIB_CXXFLAGS = $(__stclib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
  STCLIB_CXXFLAGS = $(__stclib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       -I$(top_srcdir)/src/stc/scintilla/include \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) -I$(top_srcdir)/src/stc/scintilla/include \
         -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
         $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
  STCLIB_OBJECTS =  \
         stclib_stc.o \
         stclib_PlatWX.o \
         stclib_ScintillaWX.o
         -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
         $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
  STCLIB_OBJECTS =  \
         stclib_stc.o \
         stclib_PlatWX.o \
         stclib_ScintillaWX.o
-STCLIB_ODEP =  $(___pch_wxprec_stclib_wx_wxprec_h_gch___depname)
+STCLIB_ODEP =  $(_____pch_wxprec_stclib_wx_wxprec_h_gch___depname)
  GLDLL_CXXFLAGS = $(__gldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
  GLDLL_CXXFLAGS = $(__gldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       -DWXUSINGDLL -DWXMAKINGDLL_GL $(PIC_FLAG) $(CXXWARNINGS) $(CPPFLAGS) \
-       $(CXXFLAGS)
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_GL $(PIC_FLAG) $(CXXWARNINGS) \
+       $(CPPFLAGS) $(CXXFLAGS)
+GLDLL_OBJCXXFLAGS = $(__gldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_GL $(PIC_FLAG) $(CPPFLAGS) \
+       $(OBJCXXFLAGS)
  GLDLL_OBJECTS =  \
         $(__gldll___win32rc) \
         gldll_glcmn.o \
         $(__OPENGL_SRC_PLATFORM_OBJECTS)
  GLDLL_OBJECTS =  \
         $(__gldll___win32rc) \
         gldll_glcmn.o \
         $(__OPENGL_SRC_PLATFORM_OBJECTS)
-GLDLL_ODEP =  $(___pch_wxprec_gldll_wx_wxprec_h_gch___depname)
+GLDLL_ODEP =  $(_____pch_wxprec_gldll_wx_wxprec_h_gch___depname)
  GLLIB_CXXFLAGS = $(__gllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
  GLLIB_CXXFLAGS = $(__gllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-       -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) $(__INC_JPEG_p) \
-       $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+GLLIB_OBJCXXFLAGS = $(__gllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_BUILD_p) $(__INC_TIFF_p) \
+       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_REGEX_p) \
+       $(__INC_EXPAT_p) $(CPPFLAGS) $(OBJCXXFLAGS)
  GLLIB_OBJECTS =  \
         gllib_glcmn.o \
         $(__OPENGL_SRC_PLATFORM_OBJECTS_1)
  GLLIB_OBJECTS =  \
         gllib_glcmn.o \
         $(__OPENGL_SRC_PLATFORM_OBJECTS_1)
-GLLIB_ODEP =  $(___pch_wxprec_gllib_wx_wxprec_h_gch___depname)
+GLLIB_ODEP =  $(_____pch_wxprec_gllib_wx_wxprec_h_gch___depname)
  SOUND_SDL_CXXFLAGS = -DWXUSINGDLL -DwxUSE_GUI=0 $(PIC_FLAG) $(CPPFLAGS) \
         $(CXXFLAGS)
  SOUND_SDL_OBJECTS =  \
  SOUND_SDL_CXXFLAGS = -DWXUSINGDLL -DwxUSE_GUI=0 $(PIC_FLAG) $(CPPFLAGS) \
         $(CXXFLAGS)
  SOUND_SDL_OBJECTS =  \
@@ -1736,8 +2041,7 @@ LOCALE_MSW_LINGUAS =  it
  @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
  @COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
  @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = 
  @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
  @COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
  @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = 
-@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
-@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
+@COND_BUILD_debug@WXDEBUGFLAG = d
  @COND_UNICODE_1@WXUNICODEFLAG = u
  @COND_WXUNIV_1@WXUNIVNAME = univ
  @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIX = wx_base$(WXBASEPORT)
  @COND_UNICODE_1@WXUNICODEFLAG = u
  @COND_WXUNIV_1@WXUNIVNAME = univ
  @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIX = wx_base$(WXBASEPORT)
@@ -1748,61 +2052,62 @@ LOCALE_MSW_LINGUAS =  it
  @COND_PLATFORM_WIN32_1@        wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)
  @COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
  @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
  @COND_PLATFORM_WIN32_1@        wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)
  @COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
  @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
-COND_WXUSE_REGEX_BUILTIN___wxregex___depname = \
+COND_wxUSE_REGEX_builtin___wxregex___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
         $(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_WXUSE_REGEX_BUILTIN@__wxregex___depname = $(COND_WXUSE_REGEX_BUILTIN___wxregex___depname)
-@COND_SHARED_0_WXUSE_REGEX_BUILTIN@__install_wxregex___depname \
-@COND_SHARED_0_WXUSE_REGEX_BUILTIN@    = install_wxregex
-@COND_SHARED_0_WXUSE_REGEX_BUILTIN@__uninstall_wxregex___depname \
-@COND_SHARED_0_WXUSE_REGEX_BUILTIN@    = uninstall_wxregex
-COND_WXUSE_ZLIB_BUILTIN___wxzlib___depname = \
-       $(LIBDIRNAME)/$(LIBPREFIX)wxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_WXUSE_ZLIB_BUILTIN@__wxzlib___depname = $(COND_WXUSE_ZLIB_BUILTIN___wxzlib___depname)
-@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@__install_wxzlib___depname \
-@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@     = install_wxzlib
-@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@__uninstall_wxzlib___depname \
-@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@     = uninstall_wxzlib
-COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN___wxpng___depname = \
-       $(LIBDIRNAME)/$(LIBPREFIX)wxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__wxpng___depname = $(COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN___wxpng___depname)
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__install_wxpng___depname \
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = install_wxpng
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__uninstall_wxpng___depname \
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = uninstall_wxpng
-COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN___wxjpeg___depname = \
-       $(LIBDIRNAME)/$(LIBPREFIX)wxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__wxjpeg___depname = $(COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN___wxjpeg___depname)
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__install_wxjpeg___depname \
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@        = install_wxjpeg
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__uninstall_wxjpeg___depname \
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@        = uninstall_wxjpeg
-COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN___wxtiff___depname = \
-       $(LIBDIRNAME)/$(LIBPREFIX)wxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__wxtiff___depname = $(COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN___wxtiff___depname)
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__install_wxtiff___depname \
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@        = install_wxtiff
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__uninstall_wxtiff___depname \
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@        = uninstall_wxtiff
+@COND_wxUSE_REGEX_builtin@__wxregex___depname = $(COND_wxUSE_REGEX_builtin___wxregex___depname)
+@COND_SHARED_0_wxUSE_REGEX_builtin@__install_wxregex___depname \
+@COND_SHARED_0_wxUSE_REGEX_builtin@    = install_wxregex
+@COND_SHARED_0_wxUSE_REGEX_builtin@__uninstall_wxregex___depname \
+@COND_SHARED_0_wxUSE_REGEX_builtin@    = uninstall_wxregex
+COND_wxUSE_ZLIB_builtin___wxzlib___depname = \
+       $(LIBDIRNAME)/$(LIBPREFIX)wxzlib$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_wxUSE_ZLIB_builtin@__wxzlib___depname = $(COND_wxUSE_ZLIB_builtin___wxzlib___depname)
+@COND_SHARED_0_wxUSE_ZLIB_builtin@__install_wxzlib___depname \
+@COND_SHARED_0_wxUSE_ZLIB_builtin@     = install_wxzlib
+@COND_SHARED_0_wxUSE_ZLIB_builtin@__uninstall_wxzlib___depname \
+@COND_SHARED_0_wxUSE_ZLIB_builtin@     = uninstall_wxzlib
+COND_USE_GUI_1_wxUSE_LIBPNG_builtin___wxpng___depname = \
+       $(LIBDIRNAME)/$(LIBPREFIX)wxpng$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__wxpng___depname = $(COND_USE_GUI_1_wxUSE_LIBPNG_builtin___wxpng___depname)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin@__install_wxpng___depname \
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin@ = install_wxpng
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin@__uninstall_wxpng___depname \
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin@ = uninstall_wxpng
+COND_USE_GUI_1_wxUSE_LIBJPEG_builtin___wxjpeg___depname = \
+       $(LIBDIRNAME)/$(LIBPREFIX)wxjpeg$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__wxjpeg___depname = $(COND_USE_GUI_1_wxUSE_LIBJPEG_builtin___wxjpeg___depname)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin@__install_wxjpeg___depname \
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin@        = install_wxjpeg
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin@__uninstall_wxjpeg___depname \
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin@        = uninstall_wxjpeg
+COND_USE_GUI_1_wxUSE_LIBTIFF_builtin___wxtiff___depname = \
+       $(LIBDIRNAME)/$(LIBPREFIX)wxtiff$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__wxtiff___depname = $(COND_USE_GUI_1_wxUSE_LIBTIFF_builtin___wxtiff___depname)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@__install_wxtiff___depname \
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@        = install_wxtiff
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@__uninstall_wxtiff___depname \
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@        = uninstall_wxtiff
  @COND_PLATFORM_UNIX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
  @COND_PLATFORM_MACOSX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
  @COND_PLATFORM_OS2_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
  @COND_PLATFORM_WIN32_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_win32.o
  @COND_PLATFORM_MACOS_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_apple.o
  @COND_PLATFORM_MSDOS_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_msdos.o
  @COND_PLATFORM_UNIX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
  @COND_PLATFORM_MACOSX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
  @COND_PLATFORM_OS2_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
  @COND_PLATFORM_WIN32_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_win32.o
  @COND_PLATFORM_MACOS_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_apple.o
  @COND_PLATFORM_MSDOS_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_msdos.o
-COND_WXUSE_EXPAT_BUILTIN___wxexpat___depname = \
-       $(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_WXUSE_EXPAT_BUILTIN@__wxexpat___depname = $(COND_WXUSE_EXPAT_BUILTIN___wxexpat___depname)
-@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@__install_wxexpat___depname \
-@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@    = install_wxexpat
-@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@__uninstall_wxexpat___depname \
-@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@    = uninstall_wxexpat
+COND_wxUSE_EXPAT_builtin___wxexpat___depname = \
+       $(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_wxUSE_EXPAT_builtin@__wxexpat___depname = $(COND_wxUSE_EXPAT_builtin___wxexpat___depname)
+@COND_SHARED_0_wxUSE_EXPAT_builtin@__install_wxexpat___depname \
+@COND_SHARED_0_wxUSE_EXPAT_builtin@    = install_wxexpat
+@COND_SHARED_0_wxUSE_EXPAT_builtin@__uninstall_wxexpat___depname \
+@COND_SHARED_0_wxUSE_EXPAT_builtin@    = uninstall_wxexpat
  COND_USE_STC_1___wxscintilla___depname = \
  COND_USE_STC_1___wxscintilla___depname = \
-       $(LIBDIRNAME)/$(LIBPREFIX)wxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+       $(LIBDIRNAME)/$(LIBPREFIX)wxscintilla$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_USE_STC_1@__wxscintilla___depname = $(COND_USE_STC_1___wxscintilla___depname)
  @COND_SHARED_0_USE_STC_1@__install_wxscintilla___depname \
  @COND_SHARED_0_USE_STC_1@      = install_wxscintilla
  @COND_SHARED_0_USE_STC_1@__uninstall_wxscintilla___depname \
  @COND_SHARED_0_USE_STC_1@      = uninstall_wxscintilla
  @COND_USE_STC_1@__wxscintilla___depname = $(COND_USE_STC_1___wxscintilla___depname)
  @COND_SHARED_0_USE_STC_1@__install_wxscintilla___depname \
  @COND_SHARED_0_USE_STC_1@      = install_wxscintilla
  @COND_SHARED_0_USE_STC_1@__uninstall_wxscintilla___depname \
  @COND_SHARED_0_USE_STC_1@      = uninstall_wxscintilla
+@COND_MONOLITHIC_0_SHARED_1@__wxscintilla_usingdll_p = -DWXUSINGDLL
  @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
  @COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
  @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
  @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
  @COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
  @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
@@ -1811,212 +2116,260 @@ COND_USE_STC_1___wxscintilla___depname = \
  @COND_PLATFORM_UNIX_1@PLUGIN_VERSION0 = $(WX_VERSION)
  @COND_PLATFORM_UNIX_0@PLUGVERDELIM = 
  @COND_PLATFORM_UNIX_1@PLUGVERDELIM = -
  @COND_PLATFORM_UNIX_1@PLUGIN_VERSION0 = $(WX_VERSION)
  @COND_PLATFORM_UNIX_0@PLUGVERDELIM = 
  @COND_PLATFORM_UNIX_1@PLUGVERDELIM = -
-@COND_BUILD_DEBUG_UNICODE_0@PLUGINSUFFIX = d
-@COND_BUILD_DEBUG_UNICODE_1@PLUGINSUFFIX = ud
-@COND_BUILD_RELEASE_UNICODE_0@PLUGINSUFFIX = 
-@COND_BUILD_RELEASE_UNICODE_1@PLUGINSUFFIX = u
  @COND_TOOLKIT_WINCE@BASE_WINCE_SRC = src/msw/wince/time.cpp
  @COND_TOOLKIT_WINCE@BASE_WINCE_HDR = wx/msw/wince/time.h \
  @COND_TOOLKIT_WINCE@   wx/msw/wince/chkconf.h
  @COND_TOOLKIT_WINCE@NET_WINCE_SRC = src/msw/wince/net.cpp
  @COND_TOOLKIT_WINCE@BASE_WINCE_SRC = src/msw/wince/time.cpp
  @COND_TOOLKIT_WINCE@BASE_WINCE_HDR = wx/msw/wince/time.h \
  @COND_TOOLKIT_WINCE@   wx/msw/wince/chkconf.h
  @COND_TOOLKIT_WINCE@NET_WINCE_SRC = src/msw/wince/net.cpp
-@COND_TOOLKIT_WINCE@NET_WINCE_HDR = wx/msw/wince/net.h
  @COND_TOOLKIT_MSW@MSW_HTML_HDR = wx/msw/helpbest.h
  @COND_TOOLKIT_MSW@MSW_HTML_HDR = wx/msw/helpbest.h
+@COND_TOOLKIT_OSX_CARBON@OPENGL_HDR_PLATFORM = wx/osx/glcanvas.h
+@COND_TOOLKIT_OSX_COCOA@OPENGL_HDR_PLATFORM = wx/osx/glcanvas.h
  @COND_TOOLKIT_COCOA@OPENGL_HDR_PLATFORM = wx/cocoa/glcanvas.h
  @COND_TOOLKIT_COCOA@OPENGL_HDR_PLATFORM = wx/cocoa/glcanvas.h
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@OPENGL_HDR_PLATFORM \
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    = wx/gtk1/glcanvas.h wx/unix/glx11.h
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@OPENGL_HDR_PLATFORM \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   = wx/gtk/glcanvas.h wx/unix/glx11.h
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@OPENGL_HDR_PLATFORM \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   = wx/gtk/glcanvas.h wx/unix/glx11.h
-@COND_TOOLKIT_MOTIF@OPENGL_HDR_PLATFORM = wx/x11/glcanvas.h wx/unix/glx11.h
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@OPENGL_HDR_PLATFORM \
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    = wx/gtk1/glcanvas.h wx/unix/glx11.h
  @COND_TOOLKIT_MSW@OPENGL_HDR_PLATFORM = wx/msw/glcanvas.h
  @COND_TOOLKIT_MSW@OPENGL_HDR_PLATFORM = wx/msw/glcanvas.h
-@COND_TOOLKIT_OSX_CARBON@OPENGL_HDR_PLATFORM = \
-@COND_TOOLKIT_OSX_CARBON@      wx/osx/glcanvas.h wx/osx/carbon/glcanvas.h
  @COND_TOOLKIT_WINCE@OPENGL_HDR_PLATFORM = wx/msw/glcanvas.h
  @COND_TOOLKIT_WINCE@OPENGL_HDR_PLATFORM = wx/msw/glcanvas.h
+@COND_TOOLKIT_MOTIF@OPENGL_HDR_PLATFORM = wx/x11/glcanvas.h wx/unix/glx11.h
  @COND_TOOLKIT_X11@OPENGL_HDR_PLATFORM = wx/x11/glcanvas.h wx/unix/glx11.h
  @COND_TOOLKIT_X11@OPENGL_HDR_PLATFORM = wx/x11/glcanvas.h wx/unix/glx11.h
-COND_TOOLKIT__BASE_OSX_SRC =  \
+COND_TOOLKIT_OSX_CARBON_BASE_OSX_SRC =  \
+       src/osx/core/mimetype.cpp \
+       src/osx/core/cfstring.cpp \
+       src/osx/core/evtloop_cf.cpp \
+       src/osx/core/stdpaths_cf.cpp \
+       src/osx/core/strconv_cf.cpp \
+       src/osx/core/utilsexc_base.cpp \
         src/common/fdiodispatcher.cpp \
         src/common/selectdispatcher.cpp \
         src/common/fdiodispatcher.cpp \
         src/common/selectdispatcher.cpp \
-       src/unix/epolldispatcher.cpp \
         src/unix/appunix.cpp \
         src/unix/appunix.cpp \
-       src/unix/evtloopunix.cpp \
         src/unix/dir.cpp \
         src/unix/dlunix.cpp \
         src/unix/dir.cpp \
         src/unix/dlunix.cpp \
+       src/unix/epolldispatcher.cpp \
+       src/unix/evtloopunix.cpp \
+       src/unix/fdiounix.cpp \
         src/unix/snglinst.cpp \
         src/unix/snglinst.cpp \
+       src/unix/stackwalk.cpp \
         src/unix/stdpaths.cpp \
         src/unix/timerunx.cpp \
         src/unix/threadpsx.cpp \
         src/unix/stdpaths.cpp \
         src/unix/timerunx.cpp \
         src/unix/threadpsx.cpp \
-       src/unix/stackwalk.cpp \
         src/unix/utilsunx.cpp \
         src/unix/utilsunx.cpp \
-       src/unix/mimetype.cpp \
+       src/unix/fswatcher_kqueue.cpp
+@COND_TOOLKIT_OSX_CARBON@BASE_OSX_SRC = $(COND_TOOLKIT_OSX_CARBON_BASE_OSX_SRC)
+COND_TOOLKIT_OSX_COCOA_BASE_OSX_SRC =  \
+       src/osx/core/mimetype.cpp \
         src/osx/core/cfstring.cpp \
         src/osx/core/cfstring.cpp \
-       src/osx/core/gsockosx.cpp \
+       src/osx/core/evtloop_cf.cpp \
         src/osx/core/stdpaths_cf.cpp \
         src/osx/core/strconv_cf.cpp \
         src/osx/core/stdpaths_cf.cpp \
         src/osx/core/strconv_cf.cpp \
-       src/osx/core/utilsexc_base.cpp
-@COND_TOOLKIT_@BASE_OSX_SRC = $(COND_TOOLKIT__BASE_OSX_SRC)
-COND_TOOLKIT_COCOA_BASE_OSX_SRC =  \
+       src/osx/core/utilsexc_base.cpp \
         src/common/fdiodispatcher.cpp \
         src/common/selectdispatcher.cpp \
         src/common/fdiodispatcher.cpp \
         src/common/selectdispatcher.cpp \
-       src/unix/epolldispatcher.cpp \
         src/unix/appunix.cpp \
         src/unix/appunix.cpp \
-       src/unix/evtloopunix.cpp \
         src/unix/dir.cpp \
         src/unix/dlunix.cpp \
         src/unix/dir.cpp \
         src/unix/dlunix.cpp \
+       src/unix/epolldispatcher.cpp \
+       src/unix/evtloopunix.cpp \
+       src/unix/fdiounix.cpp \
         src/unix/snglinst.cpp \
         src/unix/snglinst.cpp \
+       src/unix/stackwalk.cpp \
         src/unix/stdpaths.cpp \
         src/unix/timerunx.cpp \
         src/unix/threadpsx.cpp \
         src/unix/stdpaths.cpp \
         src/unix/timerunx.cpp \
         src/unix/threadpsx.cpp \
-       src/unix/stackwalk.cpp \
         src/unix/utilsunx.cpp \
         src/unix/utilsunx.cpp \
-       src/unix/mimetype.cpp \
+       src/unix/fswatcher_kqueue.cpp
+@COND_TOOLKIT_OSX_COCOA@BASE_OSX_SRC = $(COND_TOOLKIT_OSX_COCOA_BASE_OSX_SRC)
+COND_TOOLKIT_OSX_IPHONE_BASE_OSX_SRC =  \
+       src/osx/core/mimetype.cpp \
         src/osx/core/cfstring.cpp \
         src/osx/core/cfstring.cpp \
-       src/osx/core/gsockosx.cpp \
+       src/osx/core/evtloop_cf.cpp \
         src/osx/core/stdpaths_cf.cpp \
         src/osx/core/strconv_cf.cpp \
         src/osx/core/stdpaths_cf.cpp \
         src/osx/core/strconv_cf.cpp \
-       src/osx/core/utilsexc_base.cpp
-@COND_TOOLKIT_COCOA@BASE_OSX_SRC = $(COND_TOOLKIT_COCOA_BASE_OSX_SRC)
-COND_TOOLKIT_GTK_BASE_OSX_SRC =  \
+       src/osx/core/utilsexc_base.cpp \
         src/common/fdiodispatcher.cpp \
         src/common/selectdispatcher.cpp \
         src/common/fdiodispatcher.cpp \
         src/common/selectdispatcher.cpp \
-       src/unix/epolldispatcher.cpp \
         src/unix/appunix.cpp \
         src/unix/appunix.cpp \
-       src/unix/evtloopunix.cpp \
         src/unix/dir.cpp \
         src/unix/dlunix.cpp \
         src/unix/dir.cpp \
         src/unix/dlunix.cpp \
+       src/unix/epolldispatcher.cpp \
+       src/unix/evtloopunix.cpp \
+       src/unix/fdiounix.cpp \
         src/unix/snglinst.cpp \
         src/unix/snglinst.cpp \
+       src/unix/stackwalk.cpp \
         src/unix/stdpaths.cpp \
         src/unix/timerunx.cpp \
         src/unix/threadpsx.cpp \
         src/unix/stdpaths.cpp \
         src/unix/timerunx.cpp \
         src/unix/threadpsx.cpp \
+       src/unix/utilsunx.cpp \
+       src/unix/fswatcher_kqueue.cpp
+@COND_TOOLKIT_OSX_IPHONE@BASE_OSX_SRC = $(COND_TOOLKIT_OSX_IPHONE_BASE_OSX_SRC)
+COND_TOOLKIT_COCOA_BASE_OSX_SRC =  \
+       src/common/fdiodispatcher.cpp \
+       src/common/selectdispatcher.cpp \
+       src/unix/appunix.cpp \
+       src/unix/dir.cpp \
+       src/unix/dlunix.cpp \
+       src/unix/epolldispatcher.cpp \
+       src/unix/evtloopunix.cpp \
+       src/unix/fdiounix.cpp \
+       src/unix/snglinst.cpp \
         src/unix/stackwalk.cpp \
         src/unix/stackwalk.cpp \
+       src/unix/stdpaths.cpp \
+       src/unix/timerunx.cpp \
+       src/unix/threadpsx.cpp \
         src/unix/utilsunx.cpp \
         src/unix/utilsunx.cpp \
+       src/unix/fswatcher_kqueue.cpp \
         src/unix/mimetype.cpp \
         src/osx/core/cfstring.cpp \
         src/unix/mimetype.cpp \
         src/osx/core/cfstring.cpp \
-       src/osx/core/gsockosx.cpp \
+       src/osx/core/evtloop_cf.cpp \
         src/osx/core/stdpaths_cf.cpp \
         src/osx/core/strconv_cf.cpp \
         src/osx/core/utilsexc_base.cpp
         src/osx/core/stdpaths_cf.cpp \
         src/osx/core/strconv_cf.cpp \
         src/osx/core/utilsexc_base.cpp
-@COND_TOOLKIT_GTK@BASE_OSX_SRC = $(COND_TOOLKIT_GTK_BASE_OSX_SRC)
-COND_TOOLKIT_MOTIF_BASE_OSX_SRC =  \
+@COND_TOOLKIT_COCOA@BASE_OSX_SRC = $(COND_TOOLKIT_COCOA_BASE_OSX_SRC)
+COND_TOOLKIT_GTK_BASE_OSX_SRC =  \
         src/common/fdiodispatcher.cpp \
         src/common/selectdispatcher.cpp \
         src/common/fdiodispatcher.cpp \
         src/common/selectdispatcher.cpp \
-       src/unix/epolldispatcher.cpp \
         src/unix/appunix.cpp \
         src/unix/appunix.cpp \
-       src/unix/evtloopunix.cpp \
         src/unix/dir.cpp \
         src/unix/dlunix.cpp \
         src/unix/dir.cpp \
         src/unix/dlunix.cpp \
+       src/unix/epolldispatcher.cpp \
+       src/unix/evtloopunix.cpp \
+       src/unix/fdiounix.cpp \
         src/unix/snglinst.cpp \
         src/unix/snglinst.cpp \
+       src/unix/stackwalk.cpp \
         src/unix/stdpaths.cpp \
         src/unix/timerunx.cpp \
         src/unix/threadpsx.cpp \
         src/unix/stdpaths.cpp \
         src/unix/timerunx.cpp \
         src/unix/threadpsx.cpp \
-       src/unix/stackwalk.cpp \
         src/unix/utilsunx.cpp \
         src/unix/utilsunx.cpp \
+       src/unix/fswatcher_kqueue.cpp \
         src/unix/mimetype.cpp \
         src/osx/core/cfstring.cpp \
         src/unix/mimetype.cpp \
         src/osx/core/cfstring.cpp \
-       src/osx/core/gsockosx.cpp \
+       src/osx/core/evtloop_cf.cpp \
         src/osx/core/stdpaths_cf.cpp \
         src/osx/core/strconv_cf.cpp \
         src/osx/core/utilsexc_base.cpp
         src/osx/core/stdpaths_cf.cpp \
         src/osx/core/strconv_cf.cpp \
         src/osx/core/utilsexc_base.cpp
-@COND_TOOLKIT_MOTIF@BASE_OSX_SRC = $(COND_TOOLKIT_MOTIF_BASE_OSX_SRC)
-COND_TOOLKIT_OSX_CARBON_BASE_OSX_SRC =  \
-       src/osx/core/mimetype.cpp \
-       src/osx/core/cfstring.cpp \
-       src/osx/core/gsockosx.cpp \
-       src/osx/core/stdpaths_cf.cpp \
-       src/osx/core/strconv_cf.cpp \
-       src/osx/core/utilsexc_base.cpp \
+@COND_TOOLKIT_GTK@BASE_OSX_SRC = $(COND_TOOLKIT_GTK_BASE_OSX_SRC)
+COND_TOOLKIT_X11_BASE_OSX_SRC =  \
         src/common/fdiodispatcher.cpp \
         src/common/selectdispatcher.cpp \
         src/common/fdiodispatcher.cpp \
         src/common/selectdispatcher.cpp \
-       src/unix/epolldispatcher.cpp \
         src/unix/appunix.cpp \
         src/unix/appunix.cpp \
-       src/unix/evtloopunix.cpp \
         src/unix/dir.cpp \
         src/unix/dlunix.cpp \
         src/unix/dir.cpp \
         src/unix/dlunix.cpp \
+       src/unix/epolldispatcher.cpp \
+       src/unix/evtloopunix.cpp \
+       src/unix/fdiounix.cpp \
         src/unix/snglinst.cpp \
         src/unix/snglinst.cpp \
+       src/unix/stackwalk.cpp \
         src/unix/stdpaths.cpp \
         src/unix/timerunx.cpp \
         src/unix/threadpsx.cpp \
         src/unix/stdpaths.cpp \
         src/unix/timerunx.cpp \
         src/unix/threadpsx.cpp \
-       src/unix/stackwalk.cpp \
-       src/unix/utilsunx.cpp
-@COND_TOOLKIT_OSX_CARBON@BASE_OSX_SRC = $(COND_TOOLKIT_OSX_CARBON_BASE_OSX_SRC)
-COND_TOOLKIT_OSX_COCOA_BASE_OSX_SRC =  \
-       src/osx/core/mimetype.cpp \
+       src/unix/utilsunx.cpp \
+       src/unix/fswatcher_kqueue.cpp \
+       src/unix/mimetype.cpp \
         src/osx/core/cfstring.cpp \
         src/osx/core/cfstring.cpp \
-       src/osx/core/gsockosx.cpp \
+       src/osx/core/evtloop_cf.cpp \
         src/osx/core/stdpaths_cf.cpp \
         src/osx/core/strconv_cf.cpp \
         src/osx/core/stdpaths_cf.cpp \
         src/osx/core/strconv_cf.cpp \
-       src/osx/core/utilsexc_base.cpp \
+       src/osx/core/utilsexc_base.cpp
+@COND_TOOLKIT_X11@BASE_OSX_SRC = $(COND_TOOLKIT_X11_BASE_OSX_SRC)
+COND_TOOLKIT_MOTIF_BASE_OSX_SRC =  \
         src/common/fdiodispatcher.cpp \
         src/common/selectdispatcher.cpp \
         src/common/fdiodispatcher.cpp \
         src/common/selectdispatcher.cpp \
-       src/unix/epolldispatcher.cpp \
         src/unix/appunix.cpp \
         src/unix/appunix.cpp \
-       src/unix/evtloopunix.cpp \
         src/unix/dir.cpp \
         src/unix/dlunix.cpp \
         src/unix/dir.cpp \
         src/unix/dlunix.cpp \
+       src/unix/epolldispatcher.cpp \
+       src/unix/evtloopunix.cpp \
+       src/unix/fdiounix.cpp \
         src/unix/snglinst.cpp \
         src/unix/snglinst.cpp \
+       src/unix/stackwalk.cpp \
         src/unix/stdpaths.cpp \
         src/unix/timerunx.cpp \
         src/unix/threadpsx.cpp \
         src/unix/stdpaths.cpp \
         src/unix/timerunx.cpp \
         src/unix/threadpsx.cpp \
-       src/unix/stackwalk.cpp \
-       src/unix/utilsunx.cpp
-@COND_TOOLKIT_OSX_COCOA@BASE_OSX_SRC = $(COND_TOOLKIT_OSX_COCOA_BASE_OSX_SRC)
-COND_TOOLKIT_X11_BASE_OSX_SRC =  \
+       src/unix/utilsunx.cpp \
+       src/unix/fswatcher_kqueue.cpp \
+       src/unix/mimetype.cpp \
+       src/osx/core/cfstring.cpp \
+       src/osx/core/evtloop_cf.cpp \
+       src/osx/core/stdpaths_cf.cpp \
+       src/osx/core/strconv_cf.cpp \
+       src/osx/core/utilsexc_base.cpp
+@COND_TOOLKIT_MOTIF@BASE_OSX_SRC = $(COND_TOOLKIT_MOTIF_BASE_OSX_SRC)
+COND_TOOLKIT__BASE_OSX_SRC =  \
         src/common/fdiodispatcher.cpp \
         src/common/selectdispatcher.cpp \
         src/common/fdiodispatcher.cpp \
         src/common/selectdispatcher.cpp \
-       src/unix/epolldispatcher.cpp \
         src/unix/appunix.cpp \
         src/unix/appunix.cpp \
-       src/unix/evtloopunix.cpp \
         src/unix/dir.cpp \
         src/unix/dlunix.cpp \
         src/unix/dir.cpp \
         src/unix/dlunix.cpp \
+       src/unix/epolldispatcher.cpp \
+       src/unix/evtloopunix.cpp \
+       src/unix/fdiounix.cpp \
         src/unix/snglinst.cpp \
         src/unix/snglinst.cpp \
+       src/unix/stackwalk.cpp \
         src/unix/stdpaths.cpp \
         src/unix/timerunx.cpp \
         src/unix/threadpsx.cpp \
         src/unix/stdpaths.cpp \
         src/unix/timerunx.cpp \
         src/unix/threadpsx.cpp \
-       src/unix/stackwalk.cpp \
         src/unix/utilsunx.cpp \
         src/unix/utilsunx.cpp \
+       src/unix/fswatcher_kqueue.cpp \
         src/unix/mimetype.cpp \
         src/osx/core/cfstring.cpp \
         src/unix/mimetype.cpp \
         src/osx/core/cfstring.cpp \
-       src/osx/core/gsockosx.cpp \
+       src/osx/core/evtloop_cf.cpp \
         src/osx/core/stdpaths_cf.cpp \
         src/osx/core/strconv_cf.cpp \
         src/osx/core/utilsexc_base.cpp
         src/osx/core/stdpaths_cf.cpp \
         src/osx/core/strconv_cf.cpp \
         src/osx/core/utilsexc_base.cpp
-@COND_TOOLKIT_X11@BASE_OSX_SRC = $(COND_TOOLKIT_X11_BASE_OSX_SRC)
-COND_TOOLKIT__BASE_OSX_HDR =  \
-       wx/private/fdiodispatcher.h \
-       wx/private/selectdispatcher.h \
+@COND_TOOLKIT_@BASE_OSX_SRC = $(COND_TOOLKIT__BASE_OSX_SRC)
+COND_TOOLKIT_OSX_CARBON_BASE_OSX_HDR =  \
+       wx/osx/core/cfdataref.h \
+       wx/osx/core/cfref.h \
+       wx/osx/core/cfstring.h \
+       wx/osx/core/hid.h \
+       wx/osx/core/private.h \
+       wx/osx/core/stdpaths.h \
+       wx/osx/core/private/strconv_cf.h \
         wx/unix/app.h \
         wx/unix/apptbase.h \
         wx/unix/apptrait.h \
         wx/unix/chkconf.h \
         wx/unix/evtloop.h \
         wx/unix/app.h \
         wx/unix/apptbase.h \
         wx/unix/apptrait.h \
         wx/unix/chkconf.h \
         wx/unix/evtloop.h \
+       wx/unix/evtloopsrc.h \
         wx/unix/pipe.h \
         wx/unix/stdpaths.h \
         wx/unix/stackwalk.h \
         wx/unix/tls.h \
         wx/unix/pipe.h \
         wx/unix/stdpaths.h \
         wx/unix/stackwalk.h \
         wx/unix/tls.h \
-       wx/unix/execute.h \
-       wx/unix/mimetype.h \
-       wx/unix/private.h \
+       wx/unix/fswatcher_kqueue.h
+@COND_TOOLKIT_OSX_CARBON@BASE_OSX_HDR = $(COND_TOOLKIT_OSX_CARBON_BASE_OSX_HDR)
+COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR =  \
         wx/osx/core/cfdataref.h \
         wx/osx/core/cfref.h \
         wx/osx/core/cfstring.h \
         wx/osx/core/hid.h \
         wx/osx/core/private.h \
         wx/osx/core/stdpaths.h \
         wx/osx/core/cfdataref.h \
         wx/osx/core/cfref.h \
         wx/osx/core/cfstring.h \
         wx/osx/core/hid.h \
         wx/osx/core/private.h \
         wx/osx/core/stdpaths.h \
-       wx/osx/core/private/strconv_cf.h
-@COND_TOOLKIT_@BASE_OSX_HDR = $(COND_TOOLKIT__BASE_OSX_HDR)
+       wx/osx/core/private/strconv_cf.h \
+       wx/unix/app.h \
+       wx/unix/apptbase.h \
+       wx/unix/apptrait.h \
+       wx/unix/chkconf.h \
+       wx/unix/evtloop.h \
+       wx/unix/evtloopsrc.h \
+       wx/unix/pipe.h \
+       wx/unix/stdpaths.h \
+       wx/unix/stackwalk.h \
+       wx/unix/tls.h \
+       wx/unix/fswatcher_kqueue.h
+@COND_TOOLKIT_OSX_COCOA@BASE_OSX_HDR = $(COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR)
  COND_TOOLKIT_COCOA_BASE_OSX_HDR =  \
  COND_TOOLKIT_COCOA_BASE_OSX_HDR =  \
-       wx/private/fdiodispatcher.h \
-       wx/private/selectdispatcher.h \
         wx/unix/app.h \
         wx/unix/apptbase.h \
         wx/unix/apptrait.h \
         wx/unix/chkconf.h \
         wx/unix/evtloop.h \
         wx/unix/app.h \
         wx/unix/apptbase.h \
         wx/unix/apptrait.h \
         wx/unix/chkconf.h \
         wx/unix/evtloop.h \
+       wx/unix/evtloopsrc.h \
         wx/unix/pipe.h \
         wx/unix/stdpaths.h \
         wx/unix/stackwalk.h \
         wx/unix/tls.h \
         wx/unix/pipe.h \
         wx/unix/stdpaths.h \
         wx/unix/stackwalk.h \
         wx/unix/tls.h \
+       wx/unix/fswatcher_kqueue.h \
         wx/unix/execute.h \
         wx/unix/mimetype.h \
         wx/unix/execute.h \
         wx/unix/mimetype.h \
-       wx/unix/private.h \
         wx/osx/core/cfdataref.h \
         wx/osx/core/cfref.h \
         wx/osx/core/cfstring.h \
         wx/osx/core/cfdataref.h \
         wx/osx/core/cfref.h \
         wx/osx/core/cfstring.h \
@@ -2026,20 +2379,19 @@ COND_TOOLKIT_COCOA_BASE_OSX_HDR =  \
         wx/osx/core/private/strconv_cf.h
  @COND_TOOLKIT_COCOA@BASE_OSX_HDR = $(COND_TOOLKIT_COCOA_BASE_OSX_HDR)
  COND_TOOLKIT_GTK_BASE_OSX_HDR =  \
         wx/osx/core/private/strconv_cf.h
  @COND_TOOLKIT_COCOA@BASE_OSX_HDR = $(COND_TOOLKIT_COCOA_BASE_OSX_HDR)
  COND_TOOLKIT_GTK_BASE_OSX_HDR =  \
-       wx/private/fdiodispatcher.h \
-       wx/private/selectdispatcher.h \
         wx/unix/app.h \
         wx/unix/apptbase.h \
         wx/unix/apptrait.h \
         wx/unix/chkconf.h \
         wx/unix/evtloop.h \
         wx/unix/app.h \
         wx/unix/apptbase.h \
         wx/unix/apptrait.h \
         wx/unix/chkconf.h \
         wx/unix/evtloop.h \
+       wx/unix/evtloopsrc.h \
         wx/unix/pipe.h \
         wx/unix/stdpaths.h \
         wx/unix/stackwalk.h \
         wx/unix/tls.h \
         wx/unix/pipe.h \
         wx/unix/stdpaths.h \
         wx/unix/stackwalk.h \
         wx/unix/tls.h \
+       wx/unix/fswatcher_kqueue.h \
         wx/unix/execute.h \
         wx/unix/mimetype.h \
         wx/unix/execute.h \
         wx/unix/mimetype.h \
-       wx/unix/private.h \
         wx/osx/core/cfdataref.h \
         wx/osx/core/cfref.h \
         wx/osx/core/cfstring.h \
         wx/osx/core/cfdataref.h \
         wx/osx/core/cfref.h \
         wx/osx/core/cfstring.h \
@@ -2048,21 +2400,20 @@ COND_TOOLKIT_GTK_BASE_OSX_HDR =  \
         wx/osx/core/stdpaths.h \
         wx/osx/core/private/strconv_cf.h
  @COND_TOOLKIT_GTK@BASE_OSX_HDR = $(COND_TOOLKIT_GTK_BASE_OSX_HDR)
         wx/osx/core/stdpaths.h \
         wx/osx/core/private/strconv_cf.h
  @COND_TOOLKIT_GTK@BASE_OSX_HDR = $(COND_TOOLKIT_GTK_BASE_OSX_HDR)
-COND_TOOLKIT_MOTIF_BASE_OSX_HDR =  \
-       wx/private/fdiodispatcher.h \
-       wx/private/selectdispatcher.h \
+COND_TOOLKIT_X11_BASE_OSX_HDR =  \
         wx/unix/app.h \
         wx/unix/apptbase.h \
         wx/unix/apptrait.h \
         wx/unix/chkconf.h \
         wx/unix/evtloop.h \
         wx/unix/app.h \
         wx/unix/apptbase.h \
         wx/unix/apptrait.h \
         wx/unix/chkconf.h \
         wx/unix/evtloop.h \
+       wx/unix/evtloopsrc.h \
         wx/unix/pipe.h \
         wx/unix/stdpaths.h \
         wx/unix/stackwalk.h \
         wx/unix/tls.h \
         wx/unix/pipe.h \
         wx/unix/stdpaths.h \
         wx/unix/stackwalk.h \
         wx/unix/tls.h \
+       wx/unix/fswatcher_kqueue.h \
         wx/unix/execute.h \
         wx/unix/mimetype.h \
         wx/unix/execute.h \
         wx/unix/mimetype.h \
-       wx/unix/private.h \
         wx/osx/core/cfdataref.h \
         wx/osx/core/cfref.h \
         wx/osx/core/cfstring.h \
         wx/osx/core/cfdataref.h \
         wx/osx/core/cfref.h \
         wx/osx/core/cfstring.h \
@@ -2070,62 +2421,43 @@ COND_TOOLKIT_MOTIF_BASE_OSX_HDR =  \
         wx/osx/core/private.h \
         wx/osx/core/stdpaths.h \
         wx/osx/core/private/strconv_cf.h
         wx/osx/core/private.h \
         wx/osx/core/stdpaths.h \
         wx/osx/core/private/strconv_cf.h
-@COND_TOOLKIT_MOTIF@BASE_OSX_HDR = $(COND_TOOLKIT_MOTIF_BASE_OSX_HDR)
-COND_TOOLKIT_OSX_CARBON_BASE_OSX_HDR =  \
-       wx/osx/core/cfdataref.h \
-       wx/osx/core/cfref.h \
-       wx/osx/core/cfstring.h \
-       wx/osx/core/hid.h \
-       wx/osx/core/private.h \
-       wx/osx/core/stdpaths.h \
-       wx/osx/core/private/strconv_cf.h \
-       wx/private/fdiodispatcher.h \
-       wx/private/selectdispatcher.h \
+@COND_TOOLKIT_X11@BASE_OSX_HDR = $(COND_TOOLKIT_X11_BASE_OSX_HDR)
+COND_TOOLKIT_MOTIF_BASE_OSX_HDR =  \
         wx/unix/app.h \
         wx/unix/apptbase.h \
         wx/unix/apptrait.h \
         wx/unix/chkconf.h \
         wx/unix/evtloop.h \
         wx/unix/app.h \
         wx/unix/apptbase.h \
         wx/unix/apptrait.h \
         wx/unix/chkconf.h \
         wx/unix/evtloop.h \
+       wx/unix/evtloopsrc.h \
         wx/unix/pipe.h \
         wx/unix/stdpaths.h \
         wx/unix/stackwalk.h \
         wx/unix/pipe.h \
         wx/unix/stdpaths.h \
         wx/unix/stackwalk.h \
-       wx/unix/tls.h
-@COND_TOOLKIT_OSX_CARBON@BASE_OSX_HDR = $(COND_TOOLKIT_OSX_CARBON_BASE_OSX_HDR)
-COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR =  \
+       wx/unix/tls.h \
+       wx/unix/fswatcher_kqueue.h \
+       wx/unix/execute.h \
+       wx/unix/mimetype.h \
         wx/osx/core/cfdataref.h \
         wx/osx/core/cfref.h \
         wx/osx/core/cfstring.h \
         wx/osx/core/hid.h \
         wx/osx/core/private.h \
         wx/osx/core/stdpaths.h \
         wx/osx/core/cfdataref.h \
         wx/osx/core/cfref.h \
         wx/osx/core/cfstring.h \
         wx/osx/core/hid.h \
         wx/osx/core/private.h \
         wx/osx/core/stdpaths.h \
-       wx/osx/core/private/strconv_cf.h \
-       wx/private/fdiodispatcher.h \
-       wx/private/selectdispatcher.h \
-       wx/unix/app.h \
-       wx/unix/apptbase.h \
-       wx/unix/apptrait.h \
-       wx/unix/chkconf.h \
-       wx/unix/evtloop.h \
-       wx/unix/pipe.h \
-       wx/unix/stdpaths.h \
-       wx/unix/stackwalk.h \
-       wx/unix/tls.h
-@COND_TOOLKIT_OSX_COCOA@BASE_OSX_HDR = $(COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR)
-COND_TOOLKIT_X11_BASE_OSX_HDR =  \
-       wx/private/fdiodispatcher.h \
-       wx/private/selectdispatcher.h \
+       wx/osx/core/private/strconv_cf.h
+@COND_TOOLKIT_MOTIF@BASE_OSX_HDR = $(COND_TOOLKIT_MOTIF_BASE_OSX_HDR)
+COND_TOOLKIT__BASE_OSX_HDR =  \
         wx/unix/app.h \
         wx/unix/apptbase.h \
         wx/unix/apptrait.h \
         wx/unix/chkconf.h \
         wx/unix/evtloop.h \
         wx/unix/app.h \
         wx/unix/apptbase.h \
         wx/unix/apptrait.h \
         wx/unix/chkconf.h \
         wx/unix/evtloop.h \
+       wx/unix/evtloopsrc.h \
         wx/unix/pipe.h \
         wx/unix/stdpaths.h \
         wx/unix/stackwalk.h \
         wx/unix/tls.h \
         wx/unix/pipe.h \
         wx/unix/stdpaths.h \
         wx/unix/stackwalk.h \
         wx/unix/tls.h \
+       wx/unix/fswatcher_kqueue.h \
         wx/unix/execute.h \
         wx/unix/mimetype.h \
         wx/unix/execute.h \
         wx/unix/mimetype.h \
-       wx/unix/private.h \
         wx/osx/core/cfdataref.h \
         wx/osx/core/cfref.h \
         wx/osx/core/cfstring.h \
         wx/osx/core/cfdataref.h \
         wx/osx/core/cfref.h \
         wx/osx/core/cfstring.h \
@@ -2133,13 +2465,10 @@ COND_TOOLKIT_X11_BASE_OSX_HDR =  \
         wx/osx/core/private.h \
         wx/osx/core/stdpaths.h \
         wx/osx/core/private/strconv_cf.h
         wx/osx/core/private.h \
         wx/osx/core/stdpaths.h \
         wx/osx/core/private/strconv_cf.h
-@COND_TOOLKIT_X11@BASE_OSX_HDR = $(COND_TOOLKIT_X11_BASE_OSX_HDR)
+@COND_TOOLKIT_@BASE_OSX_HDR = $(COND_TOOLKIT__BASE_OSX_HDR)
  @COND_PLATFORM_MACOSX_1@BASE_PLATFORM_HDR = $(BASE_OSX_HDR)
  @COND_PLATFORM_MSDOS_1@BASE_PLATFORM_HDR = wx/msdos/mimetype.h
  COND_PLATFORM_OS2_1_BASE_PLATFORM_HDR =  \
  @COND_PLATFORM_MACOSX_1@BASE_PLATFORM_HDR = $(BASE_OSX_HDR)
  @COND_PLATFORM_MSDOS_1@BASE_PLATFORM_HDR = wx/msdos/mimetype.h
  COND_PLATFORM_OS2_1_BASE_PLATFORM_HDR =  \
-       wx/private/fdiodispatcher.h \
-       wx/private/selectdispatcher.h \
-       wx/private/gsocketiohandler.h \
         wx/unix/app.h \
         wx/os2/apptbase.h \
         wx/os2/apptrait.h \
         wx/unix/app.h \
         wx/os2/apptbase.h \
         wx/os2/apptrait.h \
@@ -2151,21 +2480,20 @@ COND_PLATFORM_OS2_1_BASE_PLATFORM_HDR =  \
         wx/os2/wxrsc.h
  @COND_PLATFORM_OS2_1@BASE_PLATFORM_HDR = $(COND_PLATFORM_OS2_1_BASE_PLATFORM_HDR)
  COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR =  \
         wx/os2/wxrsc.h
  @COND_PLATFORM_OS2_1@BASE_PLATFORM_HDR = $(COND_PLATFORM_OS2_1_BASE_PLATFORM_HDR)
  COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR =  \
-       wx/private/fdiodispatcher.h \
-       wx/private/selectdispatcher.h \
         wx/unix/app.h \
         wx/unix/apptbase.h \
         wx/unix/apptrait.h \
         wx/unix/chkconf.h \
         wx/unix/evtloop.h \
         wx/unix/app.h \
         wx/unix/apptbase.h \
         wx/unix/apptrait.h \
         wx/unix/chkconf.h \
         wx/unix/evtloop.h \
+       wx/unix/evtloopsrc.h \
         wx/unix/pipe.h \
         wx/unix/stdpaths.h \
         wx/unix/stackwalk.h \
         wx/unix/tls.h \
         wx/unix/pipe.h \
         wx/unix/stdpaths.h \
         wx/unix/stackwalk.h \
         wx/unix/tls.h \
+       wx/unix/fswatcher_kqueue.h \
         wx/unix/execute.h \
         wx/unix/mimetype.h \
         wx/unix/execute.h \
         wx/unix/mimetype.h \
-       wx/unix/private.h \
-       wx/private/gsocketiohandler.h
+       wx/unix/fswatcher_inotify.h
  @COND_PLATFORM_UNIX_1@BASE_PLATFORM_HDR = $(COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR)
  COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR =  \
         wx/msw/apptrait.h \
  @COND_PLATFORM_UNIX_1@BASE_PLATFORM_HDR = $(COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR)
  COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR =  \
         wx/msw/apptrait.h \
@@ -2188,13 +2516,9 @@ COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR =  \
         wx/msw/wrapcctl.h \
         wx/msw/wrapcdlg.h \
         wx/msw/wrapwin.h \
         wx/msw/wrapcctl.h \
         wx/msw/wrapcdlg.h \
         wx/msw/wrapwin.h \
+       wx/msw/fswatcher.h \
         $(BASE_WINCE_HDR)
  @COND_PLATFORM_WIN32_1@BASE_PLATFORM_HDR = $(COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR)
         $(BASE_WINCE_HDR)
  @COND_PLATFORM_WIN32_1@BASE_PLATFORM_HDR = $(COND_PLATFORM_WIN32_1_BASE_PLATFORM_HDR)
-@COND_PLATFORM_MACOSX_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h
-@COND_PLATFORM_OS2_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h
-@COND_PLATFORM_UNIX_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h
-@COND_PLATFORM_WIN32_1@NET_PLATFORM_HDR = \
-@COND_PLATFORM_WIN32_1@        wx/msw/gsockmsw.h $(NET_WINCE_HDR)
  @COND_TOOLKIT_COCOA@LOWLEVEL_HDR = 
  COND_TOOLKIT_DFB_LOWLEVEL_HDR =  \
         wx/generic/caret.h \
  @COND_TOOLKIT_COCOA@LOWLEVEL_HDR = 
  COND_TOOLKIT_DFB_LOWLEVEL_HDR =  \
         wx/generic/caret.h \
@@ -2276,7 +2600,10 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_LOWLEVEL_HDR =  \
         wx/gtk/dcmemory.h \
         wx/gtk/dcscreen.h \
         wx/gtk/dnd.h \
         wx/gtk/dcmemory.h \
         wx/gtk/dcscreen.h \
         wx/gtk/dnd.h \
+       wx/gtk/evtloop.h \
+       wx/gtk/evtloopsrc.h \
         wx/gtk/font.h \
         wx/gtk/font.h \
+       wx/gtk/filehistory.h \
         wx/gtk/minifram.h \
         wx/gtk/pen.h \
         wx/gtk/popupwin.h \
         wx/gtk/minifram.h \
         wx/gtk/pen.h \
         wx/gtk/popupwin.h \
@@ -2323,6 +2650,7 @@ COND_TOOLKIT_MOTIF_LOWLEVEL_HDR =  \
         wx/x11/region.h
  @COND_TOOLKIT_MOTIF@LOWLEVEL_HDR = $(COND_TOOLKIT_MOTIF_LOWLEVEL_HDR)
  COND_TOOLKIT_MSW_LOWLEVEL_HDR =  \
         wx/x11/region.h
  @COND_TOOLKIT_MOTIF@LOWLEVEL_HDR = $(COND_TOOLKIT_MOTIF_LOWLEVEL_HDR)
  COND_TOOLKIT_MSW_LOWLEVEL_HDR =  \
+       wx/msw/ole/activex.h \
         wx/msw/popupwin.h \
         wx/msw/uxtheme.h \
         wx/msw/uxthemep.h \
         wx/msw/popupwin.h \
         wx/msw/uxtheme.h \
         wx/msw/uxthemep.h \
@@ -2332,8 +2660,10 @@ COND_TOOLKIT_MSW_LOWLEVEL_HDR =  \
  @COND_TOOLKIT_MSW@LOWLEVEL_HDR = $(COND_TOOLKIT_MSW_LOWLEVEL_HDR)
  @COND_TOOLKIT_OSX_CARBON@LOWLEVEL_HDR = 
  @COND_TOOLKIT_OSX_COCOA@LOWLEVEL_HDR = 
  @COND_TOOLKIT_MSW@LOWLEVEL_HDR = $(COND_TOOLKIT_MSW_LOWLEVEL_HDR)
  @COND_TOOLKIT_OSX_CARBON@LOWLEVEL_HDR = 
  @COND_TOOLKIT_OSX_COCOA@LOWLEVEL_HDR = 
+@COND_TOOLKIT_OSX_IPHONE@LOWLEVEL_HDR = 
  @COND_TOOLKIT_PM@LOWLEVEL_HDR = 
  COND_TOOLKIT_WINCE_LOWLEVEL_HDR =  \
  @COND_TOOLKIT_PM@LOWLEVEL_HDR = 
  COND_TOOLKIT_WINCE_LOWLEVEL_HDR =  \
+       wx/msw/ole/activex.h \
         wx/msw/popupwin.h \
         wx/msw/uxtheme.h \
         wx/msw/uxthemep.h \
         wx/msw/popupwin.h \
         wx/msw/uxtheme.h \
         wx/msw/uxthemep.h \
@@ -2416,6 +2746,7 @@ COND_TOOLKIT_COCOA_GUI_HDR =  \
         wx/cocoa/dialog.h \
         wx/cocoa/dirdlg.h \
         wx/cocoa/drawer.h \
         wx/cocoa/dialog.h \
         wx/cocoa/dirdlg.h \
         wx/cocoa/drawer.h \
+       wx/cocoa/evtloop.h \
         wx/cocoa/filedlg.h \
         wx/cocoa/font.h \
         wx/cocoa/fontdlg.h \
         wx/cocoa/filedlg.h \
         wx/cocoa/font.h \
         wx/cocoa/fontdlg.h \
@@ -2458,8 +2789,7 @@ COND_TOOLKIT_COCOA_GUI_HDR =  \
         wx/generic/listctrl.h \
         wx/generic/paletteg.h \
         wx/generic/region.h \
         wx/generic/listctrl.h \
         wx/generic/paletteg.h \
         wx/generic/region.h \
-       wx/generic/statusbr.h \
-       wx/generic/tabg.h
+       wx/generic/statusbr.h
  @COND_TOOLKIT_COCOA@GUI_HDR = $(COND_TOOLKIT_COCOA_GUI_HDR)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION__GUI_HDR =  \
         wx/generic/clrpickerg.h \
  @COND_TOOLKIT_COCOA@GUI_HDR = $(COND_TOOLKIT_COCOA_GUI_HDR)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION__GUI_HDR =  \
         wx/generic/clrpickerg.h \
@@ -2473,7 +2803,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION__GUI_HDR =  \
         wx/generic/fontpickerg.h \
         wx/generic/listctrl.h \
         wx/generic/statusbr.h \
         wx/generic/fontpickerg.h \
         wx/generic/listctrl.h \
         wx/generic/statusbr.h \
-       wx/generic/tabg.h \
         wx/gtk1/accel.h \
         wx/gtk1/bmpbuttn.h \
         wx/gtk1/button.h \
         wx/gtk1/accel.h \
         wx/gtk1/bmpbuttn.h \
         wx/gtk1/button.h \
@@ -2504,7 +2833,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION__GUI_HDR =  \
         wx/gtk1/statbox.h \
         wx/gtk1/statline.h \
         wx/gtk1/stattext.h \
         wx/gtk1/statbox.h \
         wx/gtk1/statline.h \
         wx/gtk1/stattext.h \
-       wx/gtk1/tbargtk.h \
+       wx/gtk1/toolbar.h \
         wx/gtk1/textctrl.h \
         wx/gtk1/tglbtn.h \
         wx/gtk1/treectrl.h
         wx/gtk1/textctrl.h \
         wx/gtk1/tglbtn.h \
         wx/gtk1/treectrl.h
@@ -2515,8 +2844,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_GUI_HDR =  \
         wx/generic/fontdlgg.h \
         wx/generic/listctrl.h \
         wx/generic/statusbr.h \
         wx/generic/fontdlgg.h \
         wx/generic/listctrl.h \
         wx/generic/statusbr.h \
-       wx/generic/tabg.h \
         wx/gtk/accel.h \
         wx/gtk/accel.h \
+       wx/gtk/anybutton.h \
         wx/gtk/bmpbuttn.h \
         wx/gtk/button.h \
         wx/gtk/checkbox.h \
         wx/gtk/bmpbuttn.h \
         wx/gtk/button.h \
         wx/gtk/checkbox.h \
@@ -2539,13 +2868,14 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_GUI_HDR =  \
         wx/gtk/gauge.h \
         wx/gtk/gnome/gprint.h \
         wx/gtk/gnome/gvfs.h \
         wx/gtk/gauge.h \
         wx/gtk/gnome/gprint.h \
         wx/gtk/gnome/gvfs.h \
-       wx/gtk/print.h \
+       wx/gtk/infobar.h \
         wx/gtk/listbox.h \
         wx/gtk/mdi.h \
         wx/gtk/menu.h \
         wx/gtk/menuitem.h \
         wx/gtk/msgdlg.h \
         wx/gtk/notebook.h \
         wx/gtk/listbox.h \
         wx/gtk/mdi.h \
         wx/gtk/menu.h \
         wx/gtk/menuitem.h \
         wx/gtk/msgdlg.h \
         wx/gtk/notebook.h \
+       wx/gtk/print.h \
         wx/gtk/radiobox.h \
         wx/gtk/radiobut.h \
         wx/gtk/scrolbar.h \
         wx/gtk/radiobox.h \
         wx/gtk/radiobut.h \
         wx/gtk/scrolbar.h \
@@ -2557,7 +2887,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_GUI_HDR =  \
         wx/gtk/statbox.h \
         wx/gtk/statline.h \
         wx/gtk/stattext.h \
         wx/gtk/statbox.h \
         wx/gtk/statline.h \
         wx/gtk/stattext.h \
-       wx/gtk/tbargtk.h \
+       wx/gtk/toolbar.h \
         wx/gtk/textctrl.h \
         wx/gtk/textentry.h \
         wx/gtk/tglbtn.h \
         wx/gtk/textctrl.h \
         wx/gtk/textentry.h \
         wx/gtk/tglbtn.h \
@@ -2574,6 +2904,7 @@ COND_TOOLKIT_MOTIF_GUI_HDR =  \
         wx/generic/fontdlgg.h \
         wx/generic/fontpickerg.h \
         wx/generic/listctrl.h \
         wx/generic/fontdlgg.h \
         wx/generic/fontpickerg.h \
         wx/generic/listctrl.h \
+       wx/generic/mdig.h \
         wx/generic/notebook.h \
         wx/generic/prntdlgg.h \
         wx/generic/statline.h \
         wx/generic/notebook.h \
         wx/generic/prntdlgg.h \
         wx/generic/statline.h \
@@ -2610,7 +2941,6 @@ COND_TOOLKIT_MOTIF_GUI_HDR =  \
         wx/motif/gauge.h \
         wx/motif/icon.h \
         wx/motif/listbox.h \
         wx/motif/gauge.h \
         wx/motif/icon.h \
         wx/motif/listbox.h \
-       wx/motif/mdi.h \
         wx/motif/menu.h \
         wx/motif/menuitem.h \
         wx/motif/minifram.h \
         wx/motif/menu.h \
         wx/motif/menuitem.h \
         wx/motif/minifram.h \
@@ -2639,6 +2969,7 @@ COND_TOOLKIT_MSW_GUI_HDR =  \
         wx/generic/filepickerg.h \
         wx/generic/fontpickerg.h \
         wx/msw/accel.h \
         wx/generic/filepickerg.h \
         wx/generic/fontpickerg.h \
         wx/msw/accel.h \
+       wx/msw/anybutton.h \
         wx/msw/app.h \
         wx/msw/bitmap.h \
         wx/msw/bmpbuttn.h \
         wx/msw/app.h \
         wx/msw/bitmap.h \
         wx/msw/bmpbuttn.h \
@@ -2671,6 +3002,7 @@ COND_TOOLKIT_MSW_GUI_HDR =  \
         wx/msw/frame.h \
         wx/msw/gauge.h \
         wx/msw/gdiimage.h \
         wx/msw/frame.h \
         wx/msw/gauge.h \
         wx/msw/gdiimage.h \
+       wx/msw/headerctrl.h \
         wx/msw/icon.h \
         wx/msw/imaglist.h \
         wx/msw/iniconf.h \
         wx/msw/icon.h \
         wx/msw/imaglist.h \
         wx/msw/iniconf.h \
@@ -2692,14 +3024,18 @@ COND_TOOLKIT_MSW_GUI_HDR =  \
         wx/msw/ole/dropsrc.h \
         wx/msw/ole/droptgt.h \
         wx/msw/ole/oleutils.h \
         wx/msw/ole/dropsrc.h \
         wx/msw/ole/droptgt.h \
         wx/msw/ole/oleutils.h \
+       wx/msw/ownerdrw.h \
         wx/msw/palette.h \
         wx/msw/palette.h \
+       wx/msw/panel.h \
         wx/msw/pen.h \
         wx/msw/printdlg.h \
         wx/msw/printwin.h \
         wx/msw/pen.h \
         wx/msw/printdlg.h \
         wx/msw/printwin.h \
+       wx/msw/progdlg.h \
         wx/msw/radiobox.h \
         wx/msw/radiobut.h \
         wx/msw/region.h \
         wx/msw/rcdefs.h \
         wx/msw/radiobox.h \
         wx/msw/radiobut.h \
         wx/msw/region.h \
         wx/msw/rcdefs.h \
+       wx/msw/richmsgdlg.h \
         wx/msw/scrolbar.h \
         wx/msw/setup0.h \
         wx/msw/slider.h \
         wx/msw/scrolbar.h \
         wx/msw/setup0.h \
         wx/msw/slider.h \
@@ -2710,7 +3046,6 @@ COND_TOOLKIT_MSW_GUI_HDR =  \
         wx/msw/statusbar.h \
         wx/msw/statline.h \
         wx/msw/stattext.h \
         wx/msw/statusbar.h \
         wx/msw/statline.h \
         wx/msw/stattext.h \
-       wx/msw/tabctrl.h \
         wx/msw/toolbar.h \
         wx/msw/textctrl.h \
         wx/msw/textentry.h \
         wx/msw/toolbar.h \
         wx/msw/textctrl.h \
         wx/msw/textentry.h \
@@ -2755,7 +3090,9 @@ COND_TOOLKIT_MSW_GUI_HDR =  \
         wx/msw/ole/uuid.h
  @COND_TOOLKIT_MSW@GUI_HDR = $(COND_TOOLKIT_MSW_GUI_HDR)
  COND_TOOLKIT_OSX_CARBON_GUI_HDR =  \
         wx/msw/ole/uuid.h
  @COND_TOOLKIT_MSW@GUI_HDR = $(COND_TOOLKIT_MSW_GUI_HDR)
  COND_TOOLKIT_OSX_CARBON_GUI_HDR =  \
+       wx/html/webkit.h \
         wx/osx/accel.h \
         wx/osx/accel.h \
+       wx/osx/anybutton.h \
         wx/osx/app.h \
         wx/osx/bitmap.h \
         wx/osx/bmpbuttn.h \
         wx/osx/app.h \
         wx/osx/bitmap.h \
         wx/osx/bmpbuttn.h \
@@ -2783,6 +3120,7 @@ COND_TOOLKIT_OSX_CARBON_GUI_HDR =  \
         wx/osx/dirdlg.h \
         wx/osx/dnd.h \
         wx/osx/evtloop.h \
         wx/osx/dirdlg.h \
         wx/osx/dnd.h \
         wx/osx/evtloop.h \
+       wx/osx/evtloopsrc.h \
         wx/osx/filedlg.h \
         wx/osx/font.h \
         wx/osx/fontdlg.h \
         wx/osx/filedlg.h \
         wx/osx/font.h \
         wx/osx/fontdlg.h \
@@ -2823,9 +3161,9 @@ COND_TOOLKIT_OSX_CARBON_GUI_HDR =  \
         wx/osx/statline.h \
         wx/osx/stattext.h \
         wx/osx/statusbr.h \
         wx/osx/statline.h \
         wx/osx/stattext.h \
         wx/osx/statusbr.h \
-       wx/osx/tabctrl.h \
         wx/osx/taskbarosx.h \
         wx/osx/textctrl.h \
         wx/osx/taskbarosx.h \
         wx/osx/textctrl.h \
+       wx/osx/textentry.h \
         wx/osx/tglbtn.h \
         wx/osx/toolbar.h \
         wx/osx/tooltip.h \
         wx/osx/tglbtn.h \
         wx/osx/toolbar.h \
         wx/osx/tooltip.h \
@@ -2833,98 +3171,144 @@ COND_TOOLKIT_OSX_CARBON_GUI_HDR =  \
         wx/osx/treectrl.h \
         wx/osx/uma.h \
         wx/osx/window.h \
         wx/osx/treectrl.h \
         wx/osx/uma.h \
         wx/osx/window.h \
+       wx/generic/caret.h \
+       wx/generic/clrpickerg.h \
+       wx/generic/collpaneg.h \
+       wx/generic/colrdlgg.h \
+       wx/generic/dirdlgg.h \
+       wx/generic/fdrepdlg.h \
+       wx/generic/filedlgg.h \
+       wx/generic/filepickerg.h \
+       wx/generic/fontdlgg.h \
+       wx/generic/fontpickerg.h \
+       wx/generic/listctrl.h \
+       wx/generic/prntdlgg.h \
+       wx/generic/statusbr.h \
         wx/osx/core/colour.h \
         wx/osx/core/colour.h \
-       wx/osx/carbon/accel.h \
-       wx/osx/carbon/app.h \
-       wx/osx/carbon/bitmap.h \
-       wx/osx/carbon/bmpbuttn.h \
-       wx/osx/carbon/button.h \
-       wx/osx/carbon/checkbox.h \
-       wx/osx/carbon/checklst.h \
         wx/osx/carbon/chkconf.h \
         wx/osx/carbon/chkconf.h \
-       wx/osx/carbon/choice.h \
-       wx/osx/carbon/clipbrd.h \
-       wx/osx/carbon/colordlg.h \
-       wx/osx/carbon/combobox.h \
-       wx/osx/carbon/control.h \
-       wx/osx/carbon/cursor.h \
-       wx/osx/carbon/dataform.h \
-       wx/osx/carbon/dataobj.h \
-       wx/osx/carbon/dataobj2.h \
-       wx/osx/carbon/dc.h \
-       wx/osx/carbon/dcclient.h \
-       wx/osx/carbon/dcmemory.h \
-       wx/osx/carbon/dcprint.h \
-       wx/osx/carbon/dcscreen.h \
-       wx/osx/carbon/dialog.h \
-       wx/osx/carbon/dirdlg.h \
-       wx/osx/carbon/dnd.h \
         wx/osx/carbon/evtloop.h \
         wx/osx/carbon/evtloop.h \
-       wx/osx/carbon/filedlg.h \
-       wx/osx/carbon/font.h \
-       wx/osx/carbon/fontdlg.h \
-       wx/osx/carbon/frame.h \
-       wx/osx/carbon/gauge.h \
-       wx/osx/carbon/helpxxxx.h \
-       wx/osx/carbon/icon.h \
-       wx/osx/carbon/imaglist.h \
-       wx/osx/carbon/listbox.h \
-       wx/osx/carbon/listctrl.h \
-       wx/osx/carbon/mdi.h \
-       wx/osx/carbon/menu.h \
-       wx/osx/carbon/menuitem.h \
-       wx/osx/carbon/metafile.h \
-       wx/osx/carbon/mimetype.h \
-       wx/osx/carbon/minifram.h \
-       wx/osx/carbon/msgdlg.h \
-       wx/osx/carbon/nonownedwnd.h \
-       wx/osx/carbon/notebook.h \
-       wx/osx/carbon/palette.h \
-       wx/osx/carbon/popupwin.h \
-       wx/osx/carbon/pnghand.h \
-       wx/osx/carbon/pngread.h \
-       wx/osx/carbon/printdlg.h \
-       wx/osx/carbon/printmac.h \
         wx/osx/carbon/private.h \
         wx/osx/carbon/private/mactext.h \
         wx/osx/carbon/private/overlay.h \
         wx/osx/carbon/private/print.h \
         wx/osx/carbon/private.h \
         wx/osx/carbon/private/mactext.h \
         wx/osx/carbon/private/overlay.h \
         wx/osx/carbon/private/print.h \
-       wx/osx/carbon/radiobox.h \
-       wx/osx/carbon/radiobut.h \
         wx/osx/carbon/region.h \
         wx/osx/carbon/region.h \
-       wx/osx/carbon/scrolbar.h \
-       wx/osx/carbon/slider.h \
-       wx/osx/carbon/spinbutt.h \
-       wx/osx/carbon/spinctrl.h \
-       wx/osx/carbon/srchctrl.h \
         wx/osx/carbon/statbmp.h \
         wx/osx/carbon/statbmp.h \
-       wx/osx/carbon/statbox.h \
-       wx/osx/carbon/statline.h \
-       wx/osx/carbon/stattext.h \
-       wx/osx/carbon/statusbr.h \
-       wx/osx/carbon/tabctrl.h \
-       wx/osx/carbon/textctrl.h \
-       wx/osx/carbon/tglbtn.h \
-       wx/osx/carbon/toolbar.h \
-       wx/osx/carbon/tooltip.h \
-       wx/osx/carbon/toplevel.h \
-       wx/osx/carbon/treectrl.h \
-       wx/osx/carbon/uma.h \
-       wx/osx/carbon/window.h \
+       wx/osx/carbon/uma.h
+@COND_TOOLKIT_OSX_CARBON@GUI_HDR = $(COND_TOOLKIT_OSX_CARBON_GUI_HDR)
+COND_TOOLKIT_OSX_COCOA_GUI_HDR =  \
+       wx/html/webkit.h \
+       wx/osx/accel.h \
+       wx/osx/anybutton.h \
+       wx/osx/app.h \
+       wx/osx/bitmap.h \
+       wx/osx/bmpbuttn.h \
+       wx/osx/brush.h \
+       wx/osx/button.h \
+       wx/osx/checkbox.h \
+       wx/osx/checklst.h \
+       wx/osx/chkconf.h \
+       wx/osx/choice.h \
+       wx/osx/clipbrd.h \
+       wx/osx/colordlg.h \
+       wx/osx/colour.h \
+       wx/osx/combobox.h \
+       wx/osx/control.h \
+       wx/osx/cursor.h \
+       wx/osx/dataform.h \
+       wx/osx/dataobj.h \
+       wx/osx/dataobj2.h \
+       wx/osx/dc.h \
+       wx/osx/dcclient.h \
+       wx/osx/dcmemory.h \
+       wx/osx/dcprint.h \
+       wx/osx/dcscreen.h \
+       wx/osx/dialog.h \
+       wx/osx/dirdlg.h \
+       wx/osx/dnd.h \
+       wx/osx/evtloop.h \
+       wx/osx/evtloopsrc.h \
+       wx/osx/filedlg.h \
+       wx/osx/font.h \
+       wx/osx/fontdlg.h \
+       wx/osx/frame.h \
+       wx/osx/gauge.h \
+       wx/osx/helpxxxx.h \
+       wx/osx/icon.h \
+       wx/osx/imaglist.h \
+       wx/osx/listbox.h \
+       wx/osx/listctrl.h \
+       wx/osx/mdi.h \
+       wx/osx/menu.h \
+       wx/osx/menuitem.h \
+       wx/osx/metafile.h \
+       wx/osx/mimetype.h \
+       wx/osx/minifram.h \
+       wx/osx/msgdlg.h \
+       wx/osx/nonownedwnd.h \
+       wx/osx/notebook.h \
+       wx/osx/palette.h \
+       wx/osx/pen.h \
+       wx/osx/popupwin.h \
+       wx/osx/pnghand.h \
+       wx/osx/pngread.h \
+       wx/osx/printdlg.h \
+       wx/osx/printmac.h \
+       wx/osx/private.h \
+       wx/osx/radiobox.h \
+       wx/osx/radiobut.h \
+       wx/osx/region.h \
+       wx/osx/scrolbar.h \
+       wx/osx/slider.h \
+       wx/osx/spinbutt.h \
+       wx/osx/spinctrl.h \
+       wx/osx/srchctrl.h \
+       wx/osx/statbmp.h \
+       wx/osx/statbox.h \
+       wx/osx/statline.h \
+       wx/osx/stattext.h \
+       wx/osx/statusbr.h \
+       wx/osx/taskbarosx.h \
+       wx/osx/textctrl.h \
+       wx/osx/textentry.h \
+       wx/osx/tglbtn.h \
+       wx/osx/toolbar.h \
+       wx/osx/tooltip.h \
+       wx/osx/toplevel.h \
+       wx/osx/treectrl.h \
+       wx/osx/uma.h \
+       wx/osx/window.h \
         wx/generic/caret.h \
         wx/generic/clrpickerg.h \
         wx/generic/collpaneg.h \
         wx/generic/caret.h \
         wx/generic/clrpickerg.h \
         wx/generic/collpaneg.h \
+       wx/generic/colrdlgg.h \
+       wx/generic/dirdlgg.h \
         wx/generic/fdrepdlg.h \
         wx/generic/fdrepdlg.h \
+       wx/generic/filedlgg.h \
         wx/generic/filepickerg.h \
         wx/generic/fontdlgg.h \
         wx/generic/fontpickerg.h \
         wx/generic/listctrl.h \
         wx/generic/filepickerg.h \
         wx/generic/fontdlgg.h \
         wx/generic/fontpickerg.h \
         wx/generic/listctrl.h \
+       wx/generic/prntdlgg.h \
         wx/generic/statusbr.h \
         wx/generic/statusbr.h \
-       wx/generic/tabg.h \
-       wx/html/webkit.h
-@COND_TOOLKIT_OSX_CARBON@GUI_HDR = $(COND_TOOLKIT_OSX_CARBON_GUI_HDR)
-COND_TOOLKIT_OSX_COCOA_GUI_HDR =  \
+       wx/osx/cocoa/chkconf.h \
+       wx/osx/cocoa/evtloop.h \
+       wx/osx/cocoa/private.h \
+       wx/osx/core/colour.h \
+       wx/osx/carbon/chkconf.h \
+       wx/osx/carbon/evtloop.h \
+       wx/osx/carbon/private.h \
+       wx/osx/carbon/private/mactext.h \
+       wx/osx/carbon/private/overlay.h \
+       wx/osx/carbon/private/print.h \
+       wx/osx/carbon/region.h \
+       wx/osx/carbon/statbmp.h \
+       wx/osx/carbon/uma.h \
+       wx/generic/region.h
+@COND_TOOLKIT_OSX_COCOA@GUI_HDR = $(COND_TOOLKIT_OSX_COCOA_GUI_HDR)
+COND_TOOLKIT_OSX_IPHONE_GUI_HDR =  \
+       wx/html/webkit.h \
         wx/osx/accel.h \
         wx/osx/accel.h \
+       wx/osx/anybutton.h \
         wx/osx/app.h \
         wx/osx/bitmap.h \
         wx/osx/bmpbuttn.h \
         wx/osx/app.h \
         wx/osx/bitmap.h \
         wx/osx/bmpbuttn.h \
@@ -2952,6 +3336,7 @@ COND_TOOLKIT_OSX_COCOA_GUI_HDR =  \
         wx/osx/dirdlg.h \
         wx/osx/dnd.h \
         wx/osx/evtloop.h \
         wx/osx/dirdlg.h \
         wx/osx/dnd.h \
         wx/osx/evtloop.h \
+       wx/osx/evtloopsrc.h \
         wx/osx/filedlg.h \
         wx/osx/font.h \
         wx/osx/fontdlg.h \
         wx/osx/filedlg.h \
         wx/osx/font.h \
         wx/osx/fontdlg.h \
@@ -2992,17 +3377,44 @@ COND_TOOLKIT_OSX_COCOA_GUI_HDR =  \
         wx/osx/statline.h \
         wx/osx/stattext.h \
         wx/osx/statusbr.h \
         wx/osx/statline.h \
         wx/osx/stattext.h \
         wx/osx/statusbr.h \
-       wx/osx/tabctrl.h \
         wx/osx/taskbarosx.h \
         wx/osx/textctrl.h \
         wx/osx/taskbarosx.h \
         wx/osx/textctrl.h \
+       wx/osx/textentry.h \
         wx/osx/tglbtn.h \
         wx/osx/toolbar.h \
         wx/osx/tooltip.h \
         wx/osx/toplevel.h \
         wx/osx/treectrl.h \
         wx/osx/uma.h \
         wx/osx/tglbtn.h \
         wx/osx/toolbar.h \
         wx/osx/tooltip.h \
         wx/osx/toplevel.h \
         wx/osx/treectrl.h \
         wx/osx/uma.h \
-       wx/osx/window.h
-@COND_TOOLKIT_OSX_COCOA@GUI_HDR = $(COND_TOOLKIT_OSX_COCOA_GUI_HDR)
+       wx/osx/window.h \
+       wx/generic/caret.h \
+       wx/generic/clrpickerg.h \
+       wx/generic/collpaneg.h \
+       wx/generic/colrdlgg.h \
+       wx/generic/dirdlgg.h \
+       wx/generic/fdrepdlg.h \
+       wx/generic/filedlgg.h \
+       wx/generic/filepickerg.h \
+       wx/generic/fontdlgg.h \
+       wx/generic/fontpickerg.h \
+       wx/generic/listctrl.h \
+       wx/generic/prntdlgg.h \
+       wx/generic/statusbr.h \
+       wx/osx/iphone/chkconf.h \
+       wx/osx/iphone/evtloop.h \
+       wx/osx/iphone/private.h \
+       wx/osx/core/colour.h \
+       wx/osx/carbon/chkconf.h \
+       wx/osx/carbon/evtloop.h \
+       wx/osx/carbon/private.h \
+       wx/osx/carbon/private/mactext.h \
+       wx/osx/carbon/private/overlay.h \
+       wx/osx/carbon/private/print.h \
+       wx/osx/carbon/region.h \
+       wx/osx/carbon/statbmp.h \
+       wx/osx/carbon/uma.h \
+       wx/generic/region.h
+@COND_TOOLKIT_OSX_IPHONE@GUI_HDR = $(COND_TOOLKIT_OSX_IPHONE_GUI_HDR)
  COND_TOOLKIT_PM_GUI_HDR =  \
         wx/generic/caret.h \
         wx/generic/clrpickerg.h \
  COND_TOOLKIT_PM_GUI_HDR =  \
         wx/generic/caret.h \
         wx/generic/clrpickerg.h \
@@ -3053,6 +3465,7 @@ COND_TOOLKIT_PM_GUI_HDR =  \
         wx/os2/minifram.h \
         wx/os2/msgdlg.h \
         wx/os2/notebook.h \
         wx/os2/minifram.h \
         wx/os2/msgdlg.h \
         wx/os2/notebook.h \
+       wx/os2/ownerdrw.h \
         wx/os2/palette.h \
         wx/os2/pen.h \
         wx/os2/pnghand.h \
         wx/os2/palette.h \
         wx/os2/pen.h \
         wx/os2/pnghand.h \
@@ -3071,7 +3484,6 @@ COND_TOOLKIT_PM_GUI_HDR =  \
         wx/os2/statbox.h \
         wx/os2/statline.h \
         wx/os2/stattext.h \
         wx/os2/statbox.h \
         wx/os2/statline.h \
         wx/os2/stattext.h \
-       wx/os2/tabctrl.h \
         wx/os2/textctrl.h \
         wx/os2/textentry.h \
         wx/os2/tglbtn.h \
         wx/os2/textctrl.h \
         wx/os2/textentry.h \
         wx/os2/tglbtn.h \
@@ -3086,6 +3498,7 @@ COND_TOOLKIT_WINCE_GUI_HDR =  \
         wx/generic/filepickerg.h \
         wx/generic/fontpickerg.h \
         wx/msw/accel.h \
         wx/generic/filepickerg.h \
         wx/generic/fontpickerg.h \
         wx/msw/accel.h \
+       wx/msw/anybutton.h \
         wx/msw/app.h \
         wx/msw/bitmap.h \
         wx/msw/bmpbuttn.h \
         wx/msw/app.h \
         wx/msw/bitmap.h \
         wx/msw/bmpbuttn.h \
@@ -3118,6 +3531,7 @@ COND_TOOLKIT_WINCE_GUI_HDR =  \
         wx/msw/frame.h \
         wx/msw/gauge.h \
         wx/msw/gdiimage.h \
         wx/msw/frame.h \
         wx/msw/gauge.h \
         wx/msw/gdiimage.h \
+       wx/msw/headerctrl.h \
         wx/msw/icon.h \
         wx/msw/imaglist.h \
         wx/msw/iniconf.h \
         wx/msw/icon.h \
         wx/msw/imaglist.h \
         wx/msw/iniconf.h \
@@ -3139,14 +3553,18 @@ COND_TOOLKIT_WINCE_GUI_HDR =  \
         wx/msw/ole/dropsrc.h \
         wx/msw/ole/droptgt.h \
         wx/msw/ole/oleutils.h \
         wx/msw/ole/dropsrc.h \
         wx/msw/ole/droptgt.h \
         wx/msw/ole/oleutils.h \
+       wx/msw/ownerdrw.h \
         wx/msw/palette.h \
         wx/msw/palette.h \
+       wx/msw/panel.h \
         wx/msw/pen.h \
         wx/msw/printdlg.h \
         wx/msw/printwin.h \
         wx/msw/pen.h \
         wx/msw/printdlg.h \
         wx/msw/printwin.h \
+       wx/msw/progdlg.h \
         wx/msw/radiobox.h \
         wx/msw/radiobut.h \
         wx/msw/region.h \
         wx/msw/rcdefs.h \
         wx/msw/radiobox.h \
         wx/msw/radiobut.h \
         wx/msw/region.h \
         wx/msw/rcdefs.h \
+       wx/msw/richmsgdlg.h \
         wx/msw/scrolbar.h \
         wx/msw/setup0.h \
         wx/msw/slider.h \
         wx/msw/scrolbar.h \
         wx/msw/setup0.h \
         wx/msw/slider.h \
@@ -3157,7 +3575,6 @@ COND_TOOLKIT_WINCE_GUI_HDR =  \
         wx/msw/statusbar.h \
         wx/msw/statline.h \
         wx/msw/stattext.h \
         wx/msw/statusbar.h \
         wx/msw/statline.h \
         wx/msw/stattext.h \
-       wx/msw/tabctrl.h \
         wx/msw/toolbar.h \
         wx/msw/textctrl.h \
         wx/msw/textentry.h \
         wx/msw/toolbar.h \
         wx/msw/textctrl.h \
         wx/msw/textentry.h \
@@ -3223,7 +3640,8 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_HDR =  \
         wx/unix/joystick.h \
         wx/unix/sound.h \
         wx/unix/taskbarx11.h \
         wx/unix/joystick.h \
         wx/unix/sound.h \
         wx/unix/taskbarx11.h \
-       wx/gtk/hildon/notifmsg.h
+       wx/gtk/hildon/notifmsg.h \
+       wx/gtk/taskbar.h
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_HDR)
  COND_TOOLKIT_MOTIF_ADVANCED_PLATFORM_HDR =  \
         wx/unix/joystick.h \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_HDR)
  COND_TOOLKIT_MOTIF_ADVANCED_PLATFORM_HDR =  \
         wx/unix/joystick.h \
@@ -3231,42 +3649,38 @@ COND_TOOLKIT_MOTIF_ADVANCED_PLATFORM_HDR =  \
         wx/unix/taskbarx11.h \
         wx/generic/animate.h
  @COND_TOOLKIT_MOTIF@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_MOTIF_ADVANCED_PLATFORM_HDR)
         wx/unix/taskbarx11.h \
         wx/generic/animate.h
  @COND_TOOLKIT_MOTIF@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_MOTIF_ADVANCED_PLATFORM_HDR)
-COND_TOOLKIT_MSW_ADVANCED_PLATFORM_HDR =  \
-       wx/generic/animate.h \
-       wx/msw/notifmsg.h \
-       wx/msw/sound.h \
-       wx/msw/taskbar.h \
-       wx/msw/joystick.h
-@COND_TOOLKIT_MSW@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_MSW_ADVANCED_PLATFORM_HDR)
+@COND_TOOLKIT_MSW@ADVANCED_PLATFORM_HDR = \
+@COND_TOOLKIT_MSW@     wx/msw/notifmsg.h wx/msw/sound.h wx/msw/taskbar.h \
+@COND_TOOLKIT_MSW@     wx/msw/joystick.h
  COND_TOOLKIT_OSX_CARBON_ADVANCED_PLATFORM_HDR =  \
         wx/generic/animate.h \
         wx/osx/dataview.h \
  COND_TOOLKIT_OSX_CARBON_ADVANCED_PLATFORM_HDR =  \
         wx/generic/animate.h \
         wx/osx/dataview.h \
+       wx/osx/dvrenderer.h \
+       wx/osx/dvrenderers.h \
         wx/osx/joystick.h \
         wx/osx/sound.h \
         wx/osx/joystick.h \
         wx/osx/sound.h \
+       wx/osx/taskbarosx.h \
         wx/osx/carbon/drawer.h \
         wx/osx/carbon/dataview.h \
         wx/osx/carbon/drawer.h \
         wx/osx/carbon/dataview.h \
-       wx/osx/carbon/databrow.h \
-       wx/osx/carbon/sound.h \
-       wx/osx/carbon/taskbarosx.h \
         wx/osx/core/joystick.h
  @COND_TOOLKIT_OSX_CARBON@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_OSX_CARBON_ADVANCED_PLATFORM_HDR)
  COND_TOOLKIT_OSX_COCOA_ADVANCED_PLATFORM_HDR =  \
         wx/generic/animate.h \
         wx/osx/dataview.h \
         wx/osx/core/joystick.h
  @COND_TOOLKIT_OSX_CARBON@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_OSX_CARBON_ADVANCED_PLATFORM_HDR)
  COND_TOOLKIT_OSX_COCOA_ADVANCED_PLATFORM_HDR =  \
         wx/generic/animate.h \
         wx/osx/dataview.h \
+       wx/osx/dvrenderer.h \
+       wx/osx/dvrenderers.h \
         wx/osx/joystick.h \
         wx/osx/sound.h \
         wx/osx/joystick.h \
         wx/osx/sound.h \
-       wx/osx/carbon/sound.h \
-       wx/osx/carbon/taskbarosx.h \
-       wx/osx/core/joystick.h
+       wx/osx/taskbarosx.h \
+       wx/osx/core/joystick.h \
+       wx/osx/cocoa/dataview.h
  @COND_TOOLKIT_OSX_COCOA@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_OSX_COCOA_ADVANCED_PLATFORM_HDR)
  @COND_TOOLKIT_OSX_COCOA@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_OSX_COCOA_ADVANCED_PLATFORM_HDR)
+@COND_TOOLKIT_OSX_IPHONE@ADVANCED_PLATFORM_HDR = \
+@COND_TOOLKIT_OSX_IPHONE@      wx/generic/animate.h wx/osx/sound.h
  @COND_TOOLKIT_PM@ADVANCED_PLATFORM_HDR = \
  @COND_TOOLKIT_PM@      wx/generic/animate.h wx/os2/joystick.h wx/os2/sound.h
  @COND_TOOLKIT_PM@ADVANCED_PLATFORM_HDR = \
  @COND_TOOLKIT_PM@      wx/generic/animate.h wx/os2/joystick.h wx/os2/sound.h
-COND_TOOLKIT_WINCE_ADVANCED_PLATFORM_HDR =  \
-       wx/generic/animate.h \
-       wx/msw/notifmsg.h \
-       wx/msw/sound.h \
-       wx/msw/taskbar.h
-@COND_TOOLKIT_WINCE@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_WINCE_ADVANCED_PLATFORM_HDR)
+@COND_TOOLKIT_WINCE@ADVANCED_PLATFORM_HDR = \
+@COND_TOOLKIT_WINCE@   wx/msw/notifmsg.h 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_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_NATIVE_HDR =  \
  @COND_TOOLKIT_X11@ADVANCED_PLATFORM_HDR = \
  @COND_TOOLKIT_X11@     wx/unix/joystick.h wx/unix/sound.h wx/unix/taskbarx11.h
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_NATIVE_HDR =  \
@@ -3274,37 +3688,49 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_NATIVE_HDR =  \
         wx/gtk/bmpcbox.h \
         wx/gtk/calctrl.h \
         wx/gtk/dataview.h \
         wx/gtk/bmpcbox.h \
         wx/gtk/calctrl.h \
         wx/gtk/dataview.h \
+       wx/gtk/dvrenderer.h \
+       wx/gtk/dvrenderers.h \
         wx/gtk/hyperlink.h
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ADVANCED_PLATFORM_NATIVE_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_NATIVE_HDR)
  COND_TOOLKIT_MSW_ADVANCED_PLATFORM_NATIVE_HDR =  \
         wx/gtk/hyperlink.h
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ADVANCED_PLATFORM_NATIVE_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_NATIVE_HDR)
  COND_TOOLKIT_MSW_ADVANCED_PLATFORM_NATIVE_HDR =  \
+       wx/generic/animate.h \
         wx/msw/bmpcbox.h \
         wx/msw/bmpcbox.h \
+       wx/msw/commandlinkbutton.h \
         wx/msw/calctrl.h \
         wx/msw/calctrl.h \
-       wx/msw/datecontrols.h \
-       wx/msw/datectrl.h
+       wx/msw/datectrl.h \
+       wx/msw/hyperlink.h
  @COND_TOOLKIT_MSW@ADVANCED_PLATFORM_NATIVE_HDR = $(COND_TOOLKIT_MSW_ADVANCED_PLATFORM_NATIVE_HDR)
  COND_TOOLKIT_WINCE_ADVANCED_PLATFORM_NATIVE_HDR =  \
  @COND_TOOLKIT_MSW@ADVANCED_PLATFORM_NATIVE_HDR = $(COND_TOOLKIT_MSW_ADVANCED_PLATFORM_NATIVE_HDR)
  COND_TOOLKIT_WINCE_ADVANCED_PLATFORM_NATIVE_HDR =  \
+       wx/generic/animate.h \
         wx/msw/bmpcbox.h \
         wx/msw/bmpcbox.h \
+       wx/msw/commandlinkbutton.h \
         wx/msw/calctrl.h \
         wx/msw/calctrl.h \
-       wx/msw/datecontrols.h \
-       wx/msw/datectrl.h
+       wx/msw/datectrl.h \
+       wx/msw/hyperlink.h
  @COND_TOOLKIT_WINCE@ADVANCED_PLATFORM_NATIVE_HDR = $(COND_TOOLKIT_WINCE_ADVANCED_PLATFORM_NATIVE_HDR)
  COND_WXUNIV_0_ADVANCED_HDR =  \
         wx/aboutdlg.h \
         wx/animate.h \
  @COND_TOOLKIT_WINCE@ADVANCED_PLATFORM_NATIVE_HDR = $(COND_TOOLKIT_WINCE_ADVANCED_PLATFORM_NATIVE_HDR)
  COND_WXUNIV_0_ADVANCED_HDR =  \
         wx/aboutdlg.h \
         wx/animate.h \
+       wx/bannerwindow.h \
         wx/bmpcbox.h \
         wx/calctrl.h \
         wx/bmpcbox.h \
         wx/calctrl.h \
+       wx/commandlinkbutton.h \
         wx/dataview.h \
         wx/datectrl.h \
         wx/dateevt.h \
         wx/dcbuffer.h \
         wx/dataview.h \
         wx/datectrl.h \
         wx/dateevt.h \
         wx/dcbuffer.h \
+       wx/dvrenderers.h \
         wx/editlbox.h \
         wx/generic/aboutdlgg.h \
         wx/generic/bmpcbox.h \
         wx/generic/calctrlg.h \
         wx/generic/datectrl.h \
         wx/generic/dataview.h \
         wx/editlbox.h \
         wx/generic/aboutdlgg.h \
         wx/generic/bmpcbox.h \
         wx/generic/calctrlg.h \
         wx/generic/datectrl.h \
         wx/generic/dataview.h \
+       wx/generic/dvrenderer.h \
+       wx/generic/dvrenderers.h \
         wx/generic/grid.h \
         wx/generic/gridctrl.h \
         wx/generic/grid.h \
         wx/generic/gridctrl.h \
+       wx/generic/grideditors.h \
         wx/generic/gridsel.h \
         wx/generic/helpext.h \
         wx/generic/hyperlink.h \
         wx/generic/gridsel.h \
         wx/generic/helpext.h \
         wx/generic/hyperlink.h \
@@ -3326,6 +3752,7 @@ COND_WXUNIV_0_ADVANCED_HDR =  \
         wx/splash.h \
         wx/taskbar.h \
         wx/tipdlg.h \
         wx/splash.h \
         wx/taskbar.h \
         wx/tipdlg.h \
+       wx/treelist.h \
         wx/wizard.h \
         $(ADVANCED_PLATFORM_HDR) \
         $(ADVANCED_PLATFORM_NATIVE_HDR)
         wx/wizard.h \
         $(ADVANCED_PLATFORM_HDR) \
         $(ADVANCED_PLATFORM_NATIVE_HDR)
@@ -3333,20 +3760,26 @@ COND_WXUNIV_0_ADVANCED_HDR =  \
  COND_WXUNIV_1_ADVANCED_HDR =  \
         wx/aboutdlg.h \
         wx/animate.h \
  COND_WXUNIV_1_ADVANCED_HDR =  \
         wx/aboutdlg.h \
         wx/animate.h \
+       wx/bannerwindow.h \
         wx/bmpcbox.h \
         wx/calctrl.h \
         wx/bmpcbox.h \
         wx/calctrl.h \
+       wx/commandlinkbutton.h \
         wx/dataview.h \
         wx/datectrl.h \
         wx/dateevt.h \
         wx/dcbuffer.h \
         wx/dataview.h \
         wx/datectrl.h \
         wx/dateevt.h \
         wx/dcbuffer.h \
+       wx/dvrenderers.h \
         wx/editlbox.h \
         wx/generic/aboutdlgg.h \
         wx/generic/bmpcbox.h \
         wx/generic/calctrlg.h \
         wx/generic/datectrl.h \
         wx/generic/dataview.h \
         wx/editlbox.h \
         wx/generic/aboutdlgg.h \
         wx/generic/bmpcbox.h \
         wx/generic/calctrlg.h \
         wx/generic/datectrl.h \
         wx/generic/dataview.h \
+       wx/generic/dvrenderer.h \
+       wx/generic/dvrenderers.h \
         wx/generic/grid.h \
         wx/generic/gridctrl.h \
         wx/generic/grid.h \
         wx/generic/gridctrl.h \
+       wx/generic/grideditors.h \
         wx/generic/gridsel.h \
         wx/generic/helpext.h \
         wx/generic/hyperlink.h \
         wx/generic/gridsel.h \
         wx/generic/helpext.h \
         wx/generic/hyperlink.h \
@@ -3368,6 +3801,7 @@ COND_WXUNIV_1_ADVANCED_HDR =  \
         wx/splash.h \
         wx/taskbar.h \
         wx/tipdlg.h \
         wx/splash.h \
         wx/taskbar.h \
         wx/tipdlg.h \
+       wx/treelist.h \
         wx/wizard.h \
         $(ADVANCED_PLATFORM_HDR) \
         wx/generic/animate.h
         wx/wizard.h \
         $(ADVANCED_PLATFORM_HDR) \
         wx/generic/animate.h
@@ -3375,10 +3809,12 @@ COND_WXUNIV_1_ADVANCED_HDR =  \
  @COND_TOOLKIT_COCOA@MEDIA_PLATFORM_HDR = 
  @COND_TOOLKIT_GTK@MEDIA_PLATFORM_HDR = 
  @COND_TOOLKIT_MOTIF@MEDIA_PLATFORM_HDR = 
  @COND_TOOLKIT_COCOA@MEDIA_PLATFORM_HDR = 
  @COND_TOOLKIT_GTK@MEDIA_PLATFORM_HDR = 
  @COND_TOOLKIT_MOTIF@MEDIA_PLATFORM_HDR = 
-@COND_TOOLKIT_MSW@MEDIA_PLATFORM_HDR = wx/msw/ole/activex.h 
+@COND_TOOLKIT_MSW@MEDIA_PLATFORM_HDR =  
  @COND_TOOLKIT_OSX_CARBON@MEDIA_PLATFORM_HDR = 
  @COND_TOOLKIT_OSX_CARBON@MEDIA_PLATFORM_HDR = 
+@COND_TOOLKIT_OSX_COCOA@MEDIA_PLATFORM_HDR = 
+@COND_TOOLKIT_OSX_IPHONE@MEDIA_PLATFORM_HDR = 
  @COND_TOOLKIT_PM@MEDIA_PLATFORM_HDR = 
  @COND_TOOLKIT_PM@MEDIA_PLATFORM_HDR = 
-@COND_TOOLKIT_WINCE@MEDIA_PLATFORM_HDR = wx/msw/ole/activex.h
+@COND_TOOLKIT_WINCE@MEDIA_PLATFORM_HDR = 
  @COND_TOOLKIT_X11@MEDIA_PLATFORM_HDR = 
  @COND_USE_GUI_1_WXUNIV_0@GUI_CORE_HEADERS = $(GUI_HDR)
  COND_USE_GUI_1_WXUNIV_1_GUI_CORE_HEADERS =  \
  @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 =  \
@@ -3396,7 +3832,7 @@ COND_USE_GUI_1_WXUNIV_1_GUI_CORE_HEADERS =  \
         wx/generic/listctrl.h \
         wx/generic/mdig.h \
         wx/generic/statusbr.h \
         wx/generic/listctrl.h \
         wx/generic/mdig.h \
         wx/generic/statusbr.h \
-       wx/generic/tabg.h \
+       wx/univ/anybutton.h \
         wx/univ/app.h \
         wx/univ/bmpbuttn.h \
         wx/univ/button.h \
         wx/univ/app.h \
         wx/univ/bmpbuttn.h \
         wx/univ/button.h \
@@ -3416,6 +3852,7 @@ COND_USE_GUI_1_WXUNIV_1_GUI_CORE_HEADERS =  \
         wx/univ/menu.h \
         wx/univ/menuitem.h \
         wx/univ/notebook.h \
         wx/univ/menu.h \
         wx/univ/menuitem.h \
         wx/univ/notebook.h \
+       wx/univ/panel.h \
         wx/univ/radiobox.h \
         wx/univ/radiobut.h \
         wx/univ/renderer.h \
         wx/univ/radiobox.h \
         wx/univ/radiobut.h \
         wx/univ/renderer.h \
@@ -3439,6 +3876,9 @@ COND_USE_GUI_1_WXUNIV_1_GUI_CORE_HEADERS =  \
         wx/univ/window.h
  @COND_USE_GUI_1_WXUNIV_1@GUI_CORE_HEADERS = $(COND_USE_GUI_1_WXUNIV_1_GUI_CORE_HEADERS)
  COND_USE_GUI_1_ALL_GUI_HEADERS =  \
         wx/univ/window.h
  @COND_USE_GUI_1_WXUNIV_1@GUI_CORE_HEADERS = $(COND_USE_GUI_1_WXUNIV_1_GUI_CORE_HEADERS)
  COND_USE_GUI_1_ALL_GUI_HEADERS =  \
+       wx/affinematrix2dbase.h \
+       wx/affinematrix2d.h \
+       wx/anybutton.h \
         wx/bmpbuttn.h \
         wx/brush.h \
         wx/button.h \
         wx/bmpbuttn.h \
         wx/brush.h \
         wx/button.h \
@@ -3451,6 +3891,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
         wx/collpane.h \
         wx/combo.h \
         wx/combobox.h \
         wx/collpane.h \
         wx/combo.h \
         wx/combobox.h \
+       wx/compositewin.h \
         wx/control.h \
         wx/ctrlsub.h \
         wx/cursor.h \
         wx/control.h \
         wx/ctrlsub.h \
         wx/cursor.h \
@@ -3479,6 +3920,8 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
         wx/generic/dirctrlg.h \
         wx/generic/dragimgg.h \
         wx/generic/filectrlg.h \
         wx/generic/dirctrlg.h \
         wx/generic/dragimgg.h \
         wx/generic/filectrlg.h \
+       wx/generic/headerctrlg.h \
+       wx/generic/infobar.h \
         wx/generic/logg.h \
         wx/generic/msgdlgg.h \
         wx/generic/numdlgg.h \
         wx/generic/logg.h \
         wx/generic/msgdlgg.h \
         wx/generic/numdlgg.h \
@@ -3487,20 +3930,27 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
         wx/generic/prntdlgg.h \
         wx/generic/printps.h \
         wx/generic/progdlgg.h \
         wx/generic/prntdlgg.h \
         wx/generic/printps.h \
         wx/generic/progdlgg.h \
+       wx/generic/richmsgdlgg.h \
         wx/generic/scrolwin.h \
         wx/generic/spinctlg.h \
         wx/generic/splitter.h \
         wx/generic/srchctlg.h \
         wx/generic/statbmpg.h \
         wx/generic/scrolwin.h \
         wx/generic/spinctlg.h \
         wx/generic/splitter.h \
         wx/generic/srchctlg.h \
         wx/generic/statbmpg.h \
+       wx/generic/stattextg.h \
         wx/generic/textdlgg.h \
         wx/generic/treectlg.h \
         wx/graphics.h \
         wx/generic/textdlgg.h \
         wx/generic/treectlg.h \
         wx/graphics.h \
+       wx/headercol.h \
+       wx/headerctrl.h \
         wx/helphtml.h \
         wx/icon.h \
         wx/helphtml.h \
         wx/icon.h \
+       wx/infobar.h \
+       wx/itemid.h \
         wx/layout.h \
         wx/listbox.h \
         wx/mdi.h \
         wx/menu.h \
         wx/layout.h \
         wx/listbox.h \
         wx/mdi.h \
         wx/menu.h \
+       wx/mousemanager.h \
         wx/msgdlg.h \
         wx/nativewin.h \
         wx/numdlg.h \
         wx/msgdlg.h \
         wx/nativewin.h \
         wx/numdlg.h \
@@ -3511,7 +3961,10 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
         wx/position.h \
         wx/radiobox.h \
         wx/radiobut.h \
         wx/position.h \
         wx/radiobox.h \
         wx/radiobut.h \
+       wx/range.h \
+       wx/rearrangectrl.h \
         wx/renderer.h \
         wx/renderer.h \
+       wx/richmsgdlg.h \
         wx/scrolbar.h \
         wx/scrolbar.h \
         wx/scrolwin.h \
         wx/scrolbar.h \
         wx/scrolbar.h \
         wx/scrolwin.h \
@@ -3523,15 +3976,18 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
         wx/statbox.h \
         wx/stattext.h \
         wx/statusbr.h \
         wx/statbox.h \
         wx/stattext.h \
         wx/statusbr.h \
+       wx/textcompleter.h \
         wx/textctrl.h \
         wx/textdlg.h \
         wx/textentry.h \
         wx/textctrl.h \
         wx/textdlg.h \
         wx/textentry.h \
-       wx/tls.h \
+       wx/textwrapper.h \
         wx/toolbar.h \
         wx/validate.h \
         wx/valtext.h \
         wx/toolbar.h \
         wx/validate.h \
         wx/valtext.h \
+       wx/valnum.h \
         wx/window.h \
         wx/windowid.h \
         wx/window.h \
         wx/windowid.h \
+       wx/withimages.h \
         wx/wrapsizer.h \
         wx/wupdlock.h \
         wx/accel.h \
         wx/wrapsizer.h \
         wx/wupdlock.h \
         wx/accel.h \
@@ -3550,6 +4006,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
         wx/cmdproc.h \
         wx/colordlg.h \
         wx/colour.h \
         wx/cmdproc.h \
         wx/colordlg.h \
         wx/colour.h \
+       wx/colourdata.h \
         wx/cshelp.h \
         wx/dataobj.h \
         wx/dcmirror.h \
         wx/cshelp.h \
         wx/dataobj.h \
         wx/dcmirror.h \
@@ -3562,13 +4019,15 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
         wx/docmdi.h \
         wx/docview.h \
         wx/effects.h \
         wx/docmdi.h \
         wx/docview.h \
         wx/effects.h \
-       wx/evtloop.h \
+       wx/evtloopsrc.h \
         wx/fdrepdlg.h \
         wx/filectrl.h \
         wx/fdrepdlg.h \
         wx/filectrl.h \
+       wx/filehistory.h \
         wx/filepicker.h \
         wx/fontpicker.h \
         wx/fmappriv.h \
         wx/font.h \
         wx/filepicker.h \
         wx/fontpicker.h \
         wx/fmappriv.h \
         wx/font.h \
+       wx/fontdata.h \
         wx/fontdlg.h \
         wx/fontenum.h \
         wx/fontutil.h \
         wx/fontdlg.h \
         wx/fontenum.h \
         wx/fontutil.h \
@@ -3602,6 +4061,12 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
         wx/notebook.h \
         wx/ownerdrw.h \
         wx/paper.h \
         wx/notebook.h \
         wx/ownerdrw.h \
         wx/paper.h \
+       wx/persist.h \
+       wx/persist/bookctrl.h \
+       wx/persist/splitter.h \
+       wx/persist/toplevel.h \
+       wx/persist/treebook.h \
+       wx/persist/window.h \
         wx/pickerbase.h \
         wx/popupwin.h \
         wx/print.h \
         wx/pickerbase.h \
         wx/popupwin.h \
         wx/print.h \
@@ -3617,8 +4082,6 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
         wx/splitter.h \
         wx/srchctrl.h \
         wx/statline.h \
         wx/splitter.h \
         wx/srchctrl.h \
         wx/statline.h \
-       wx/tab.h \
-       wx/tabctrl.h \
         wx/tbarbase.h \
         wx/tglbtn.h \
         wx/tipwin.h \
         wx/tbarbase.h \
         wx/tglbtn.h \
         wx/tipwin.h \
@@ -3628,6 +4091,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
         wx/treebase.h \
         wx/treebook.h \
         wx/treectrl.h \
         wx/treebase.h \
         wx/treebook.h \
         wx/treectrl.h \
+       wx/uiaction.h \
         wx/valgen.h \
         wx/vidmode.h \
         wx/vlbox.h \
         wx/valgen.h \
         wx/vidmode.h \
         wx/vlbox.h \
@@ -3654,6 +4118,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
         wx/html/htmlwin.h \
         wx/html/htmprint.h \
         wx/html/m_templ.h \
         wx/html/htmlwin.h \
         wx/html/htmprint.h \
         wx/html/m_templ.h \
+       wx/html/styleparams.h \
         wx/html/winpars.h \
         wx/wxhtml.h \
         wx/htmllbox.h \
         wx/html/winpars.h \
         wx/wxhtml.h \
         wx/htmllbox.h \
@@ -3663,6 +4128,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
         wx/debugrpt.h \
         wx/xrc/xh_all.h \
         wx/xrc/xh_animatctrl.h \
         wx/debugrpt.h \
         wx/xrc/xh_all.h \
         wx/xrc/xh_animatctrl.h \
+       wx/xrc/xh_bannerwindow.h \
         wx/xrc/xh_bmpbt.h \
         wx/xrc/xh_bmp.h \
         wx/xrc/xh_bmpcbox.h \
         wx/xrc/xh_bmpbt.h \
         wx/xrc/xh_bmp.h \
         wx/xrc/xh_bmpcbox.h \
@@ -3673,11 +4139,15 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
         wx/xrc/xh_choic.h \
         wx/xrc/xh_choicbk.h \
         wx/xrc/xh_clrpicker.h \
         wx/xrc/xh_choic.h \
         wx/xrc/xh_choicbk.h \
         wx/xrc/xh_clrpicker.h \
+       wx/xrc/xh_cmdlinkbn.h \
         wx/xrc/xh_collpane.h \
         wx/xrc/xh_combo.h \
         wx/xrc/xh_collpane.h \
         wx/xrc/xh_combo.h \
+       wx/xrc/xh_comboctrl.h \
         wx/xrc/xh_datectrl.h \
         wx/xrc/xh_dirpicker.h \
         wx/xrc/xh_dlg.h \
         wx/xrc/xh_datectrl.h \
         wx/xrc/xh_dirpicker.h \
         wx/xrc/xh_dlg.h \
+       wx/xrc/xh_editlbox.h \
+       wx/xrc/xh_filectrl.h \
         wx/xrc/xh_filepicker.h \
         wx/xrc/xh_fontpicker.h \
         wx/xrc/xh_frame.h \
         wx/xrc/xh_filepicker.h \
         wx/xrc/xh_fontpicker.h \
         wx/xrc/xh_frame.h \
@@ -3713,6 +4183,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
         wx/xrc/xh_text.h \
         wx/xrc/xh_tglbtn.h \
         wx/xrc/xh_toolb.h \
         wx/xrc/xh_text.h \
         wx/xrc/xh_tglbtn.h \
         wx/xrc/xh_toolb.h \
+       wx/xrc/xh_toolbk.h \
         wx/xrc/xh_tree.h \
         wx/xrc/xh_treebk.h \
         wx/xrc/xh_unkwn.h \
         wx/xrc/xh_tree.h \
         wx/xrc/xh_treebk.h \
         wx/xrc/xh_unkwn.h \
@@ -3725,16 +4196,47 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
         wx/aui/auibar.h \
         wx/aui/tabmdi.h \
         wx/aui/aui.h \
         wx/aui/auibar.h \
         wx/aui/tabmdi.h \
         wx/aui/aui.h \
-       wx/richtext/richtextctrl.h \
+       wx/propgrid/advprops.h \
+       wx/propgrid/editors.h \
+       wx/propgrid/manager.h \
+       wx/propgrid/property.h \
+       wx/propgrid/propgrid.h \
+       wx/propgrid/propgriddefs.h \
+       wx/propgrid/propgridiface.h \
+       wx/propgrid/propgridpagestate.h \
+       wx/propgrid/props.h \
+       wx/ribbon/art.h \
+       wx/ribbon/art_internal.h \
+       wx/ribbon/bar.h \
+       wx/ribbon/buttonbar.h \
+       wx/ribbon/control.h \
+       wx/ribbon/gallery.h \
+       wx/ribbon/page.h \
+       wx/ribbon/panel.h \
+       wx/ribbon/toolbar.h \
+       wx/richtext/richtextbackgroundpage.h \
+       wx/richtext/richtextborderspage.h \
         wx/richtext/richtextbuffer.h \
         wx/richtext/richtextbuffer.h \
+       wx/richtext/richtextbulletspage.h \
+       wx/richtext/richtextctrl.h \
+       wx/richtext/richtextdialogpage.h \
+       wx/richtext/richtextfontpage.h \
+       wx/richtext/richtextformatdlg.h \
         wx/richtext/richtexthtml.h \
         wx/richtext/richtexthtml.h \
+       wx/richtext/richtextimagedlg.h \
+       wx/richtext/richtextindentspage.h \
+       wx/richtext/richtextliststylepage.h \
+       wx/richtext/richtextmarginspage.h \
+       wx/richtext/richtextprint.h \
+       wx/richtext/richtextsizepage.h \
+       wx/richtext/richtextstyledlg.h \
+       wx/richtext/richtextstylepage.h \
         wx/richtext/richtextstyles.h \
         wx/richtext/richtextstyles.h \
-       wx/richtext/richtextxml.h \
-       wx/richtext/richtextformatdlg.h \
         wx/richtext/richtextsymboldlg.h \
         wx/richtext/richtextsymboldlg.h \
-       wx/richtext/richtextstyledlg.h \
-       wx/richtext/richtextprint.h \
-       wx/stc/stc.h
+       wx/richtext/richtextuicustomization.h \
+       wx/richtext/richtextxml.h \
+       wx/stc/stc.h \
+       ${WEBVIEW_HDR}
  @COND_USE_GUI_1@ALL_GUI_HEADERS = $(COND_USE_GUI_1_ALL_GUI_HEADERS)
  COND_MONOLITHIC_1_SHARED_1___monodll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_USE_GUI_1@ALL_GUI_HEADERS = $(COND_USE_GUI_1_ALL_GUI_HEADERS)
  COND_MONOLITHIC_1_SHARED_1___monodll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
@@ -3751,18 +4253,19 @@ COND_PLATFORM_OS2_1___monodll___importlib = -import \
  COND_WINDOWS_IMPLIB_1___monodll___importlib = \
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__monodll___importlib = $(COND_WINDOWS_IMPLIB_1___monodll___importlib)
  COND_WINDOWS_IMPLIB_1___monodll___importlib = \
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__monodll___importlib = $(COND_WINDOWS_IMPLIB_1___monodll___importlib)
-@COND_GCC_PCH_1@__monodll_PCH_INC = -I.pch/wxprec_monodll
-@COND_ICC_PCH_1@__monodll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_monodll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_monodll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_monodll/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__monodll_PCH_INC = -I./.pch/wxprec_monodll
+@COND_ICC_PCH_1@__monodll_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_monodll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_monodll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_monodll/wx/wxprec.h.gch
  COND_USE_SOVERLINUX_1___monodll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_USE_SOVERLINUX_1@__monodll___soname_flags = $(COND_USE_SOVERLINUX_1___monodll___soname_flags)
  COND_USE_SOVERSOLARIS_1___monodll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_USE_SOVERSOLARIS_1@__monodll___soname_flags = $(COND_USE_SOVERSOLARIS_1___monodll___soname_flags)
  COND_USE_SOVERLINUX_1___monodll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_USE_SOVERLINUX_1@__monodll___soname_flags = $(COND_USE_SOVERLINUX_1___monodll___soname_flags)
  COND_USE_SOVERSOLARIS_1___monodll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_USE_SOVERSOLARIS_1@__monodll___soname_flags = $(COND_USE_SOVERSOLARIS_1___monodll___soname_flags)
-COND_USE_SOSYMLINKS_1___monodll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+COND_USE_SOTWOSYMLINKS_1___monodll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm \
+       -f \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
@@ -3771,9 +4274,15 @@ COND_USE_SOSYMLINKS_1___monodll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__monodll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___monodll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___monodll___so_symlinks_inst_cmd = rm -f \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+@COND_USE_SOTWOSYMLINKS_1@__monodll___so_symlinks_cmd = $(COND_USE_SOTWOSYMLINKS_1___monodll___so_symlinks_cmd)
+COND_USE_SOVERSOLARIS_1___monodll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOVERSOLARIS_1@__monodll___so_symlinks_cmd = $(COND_USE_SOVERSOLARIS_1___monodll___so_symlinks_cmd)
+COND_USE_SOTWOSYMLINKS_1___monodll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
@@ -3781,103 +4290,118 @@ COND_USE_SOSYMLINKS_1___monodll___so_symlinks_inst_cmd = rm -f \
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__monodll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___monodll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___monodll___so_symlinks_uninst_cmd = rm -f \
+@COND_USE_SOTWOSYMLINKS_1@__monodll___so_symlinks_inst_cmd = $(COND_USE_SOTWOSYMLINKS_1___monodll___so_symlinks_inst_cmd)
+COND_USE_SOVERSOLARIS_1___monodll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX);
+@COND_USE_SOVERSOLARIS_1@__monodll___so_symlinks_inst_cmd = $(COND_USE_SOVERSOLARIS_1___monodll___so_symlinks_inst_cmd)
+COND_USE_SOTWOSYMLINKS_1___monodll___so_symlinks_uninst_cmd = rm -f \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__monodll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___monodll___so_symlinks_uninst_cmd)
+@COND_USE_SOTWOSYMLINKS_1@__monodll___so_symlinks_uninst_cmd = $(COND_USE_SOTWOSYMLINKS_1___monodll___so_symlinks_uninst_cmd)
+COND_USE_SOVERSOLARIS_1___monodll___so_symlinks_uninst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOVERSOLARIS_1@__monodll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___monodll___so_symlinks_uninst_cmd)
  COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS =  \
  COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS =  \
-       monodll_mimetype.o \
+       monodll_core_mimetype.o \
         monodll_cfstring.o \
         monodll_cfstring.o \
-       monodll_gsockosx.o \
+       monodll_evtloop_cf.o \
         monodll_stdpaths_cf.o \
         monodll_strconv_cf.o \
         monodll_utilsexc_base.o \
         monodll_fdiodispatcher.o \
         monodll_selectdispatcher.o \
         monodll_stdpaths_cf.o \
         monodll_strconv_cf.o \
         monodll_utilsexc_base.o \
         monodll_fdiodispatcher.o \
         monodll_selectdispatcher.o \
-       monodll_epolldispatcher.o \
         monodll_appunix.o \
         monodll_appunix.o \
-       monodll_evtloopunix.o \
-       monodll_dir.o \
+       monodll_unix_dir.o \
         monodll_dlunix.o \
         monodll_dlunix.o \
-       monodll_snglinst.o \
-       monodll_stdpaths.o \
+       monodll_epolldispatcher.o \
+       monodll_evtloopunix.o \
+       monodll_fdiounix.o \
+       monodll_unix_snglinst.o \
+       monodll_unix_stackwalk.o \
+       monodll_unix_stdpaths.o \
         monodll_timerunx.o \
         monodll_threadpsx.o \
         monodll_timerunx.o \
         monodll_threadpsx.o \
-       monodll_stackwalk.o \
-       monodll_utilsunx.o
+       monodll_utilsunx.o \
+       monodll_fswatcher_kqueue.o
  @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS)
  @COND_PLATFORM_MSDOS_1@__BASE_PLATFORM_SRC_OBJECTS = \
  @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS)
  @COND_PLATFORM_MSDOS_1@__BASE_PLATFORM_SRC_OBJECTS = \
-@COND_PLATFORM_MSDOS_1@        monodll_dir.o monodll_mimetype.o monodll_utilsdos.o
+@COND_PLATFORM_MSDOS_1@        monodll_msdos_dir.o monodll_msdos_mimetype.o \
+@COND_PLATFORM_MSDOS_1@        monodll_utilsdos.o
  COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS =  \
         monodll_fdiodispatcher.o \
         monodll_selectdispatcher.o \
  COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS =  \
         monodll_fdiodispatcher.o \
         monodll_selectdispatcher.o \
-       monodll_gsocketiohandler.o \
         monodll_appunix.o \
         monodll_evtloopunix.o \
         monodll_timerunx.o \
         monodll_appunix.o \
         monodll_evtloopunix.o \
         monodll_timerunx.o \
-       monodll_dir.o \
-       monodll_mimetype.o \
-       monodll_stdpaths.o \
-       monodll_thread.o \
-       monodll_utils.o \
-       monodll_utilsexc.o
+       monodll_os2_dir.o \
+       monodll_os2_mimetype.o \
+       monodll_os2_snglinst.o \
+       monodll_os2_stdpaths.o \
+       monodll_os2_thread.o \
+       monodll_os2_utils.o \
+       monodll_os2_utilsexc.o
  @COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS)
  COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS =  \
         monodll_fdiodispatcher.o \
         monodll_selectdispatcher.o \
  @COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS)
  COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS =  \
         monodll_fdiodispatcher.o \
         monodll_selectdispatcher.o \
-       monodll_epolldispatcher.o \
         monodll_appunix.o \
         monodll_appunix.o \
-       monodll_evtloopunix.o \
-       monodll_dir.o \
+       monodll_unix_dir.o \
         monodll_dlunix.o \
         monodll_dlunix.o \
-       monodll_snglinst.o \
-       monodll_stdpaths.o \
+       monodll_epolldispatcher.o \
+       monodll_evtloopunix.o \
+       monodll_fdiounix.o \
+       monodll_unix_snglinst.o \
+       monodll_unix_stackwalk.o \
+       monodll_unix_stdpaths.o \
         monodll_timerunx.o \
         monodll_threadpsx.o \
         monodll_timerunx.o \
         monodll_threadpsx.o \
-       monodll_stackwalk.o \
         monodll_utilsunx.o \
         monodll_utilsunx.o \
-       monodll_mimetype.o \
-       monodll_gsocketiohandler.o
+       monodll_fswatcher_kqueue.o \
+       monodll_unix_mimetype.o \
+       monodll_fswatcher_inotify.o
  @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS)
  COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS =  \
         monodll_basemsw.o \
         monodll_crashrpt.o \
         monodll_debughlp.o \
         monodll_dde.o \
  @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS)
  COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS =  \
         monodll_basemsw.o \
         monodll_crashrpt.o \
         monodll_debughlp.o \
         monodll_dde.o \
-       monodll_dir.o \
+       monodll_msw_dir.o \
         monodll_dlmsw.o \
         monodll_dlmsw.o \
-       monodll_mimetype.o \
+       monodll_msw_mimetype.o \
         monodll_power.o \
         monodll_regconf.o \
         monodll_registry.o \
         monodll_power.o \
         monodll_regconf.o \
         monodll_registry.o \
-       monodll_snglinst.o \
-       monodll_stackwalk.o \
-       monodll_stdpaths.o \
-       monodll_thread.o \
-       monodll_timer.o \
-       monodll_utils.o \
-       monodll_utilsexc.o \
+       monodll_msw_snglinst.o \
+       monodll_msw_stackwalk.o \
+       monodll_msw_stdpaths.o \
+       monodll_msw_thread.o \
+       monodll_msw_timer.o \
+       monodll_msw_utils.o \
+       monodll_msw_utilsexc.o \
+       monodll_fswatcher.o \
         $(__BASE_WINCE_SRC_OBJECTS)
  @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS)
  @COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS = monodll_time.o
  @COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS = 
  @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \
         $(__BASE_WINCE_SRC_OBJECTS)
  @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS)
  @COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS = monodll_time.o
  @COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS = 
  @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \
-@COND_PLATFORM_WIN32_1@        = monodll_evtloop.o monodll_main.o monodll_mslu.o \
-@COND_PLATFORM_WIN32_1@        monodll_volume.o
+@COND_PLATFORM_WIN32_1@        = monodll_msw_evtloop.o monodll_msw_main.o \
+@COND_PLATFORM_WIN32_1@        monodll_mslu.o monodll_volume.o
  @COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS \
  @COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS \
-@COND_TOOLKIT_OSX_CARBON@      = monodll_utils.o monodll_uma.o
+@COND_TOOLKIT_OSX_CARBON@      = monodll_carbon_utils.o monodll_uma.o
  @COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS \
  @COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS \
-@COND_TOOLKIT_OSX_COCOA@       = monodll_utils.o
-@COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS = monodll_gsocket.o
-@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS = monodll_gsocket.o
-@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS = monodll_gsocket.o
-COND_PLATFORM_WIN32_1___NET_PLATFORM_SRC_OBJECTS =  \
-       monodll_gsocket.o \
-       monodll_gsockmsw.o \
-       monodll_urlmsw.o \
-       $(__NET_WINCE_SRC_OBJECTS)
-@COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_WIN32_1___NET_PLATFORM_SRC_OBJECTS)
+@COND_TOOLKIT_OSX_COCOA@       = monodll_osx_cocoa_utils.o
+@COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS \
+@COND_PLATFORM_MACOSX_1@       = monodll_socketiohandler.o monodll_sockunix.o \
+@COND_PLATFORM_MACOSX_1@       monodll_sockosx.o
+@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS = monodll_sockunix.o
+@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS = \
+@COND_PLATFORM_UNIX_1@ monodll_socketiohandler.o monodll_sockunix.o
+@COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS = \
+@COND_PLATFORM_WIN32_1@        monodll_sockmsw.o monodll_urlmsw.o \
+@COND_PLATFORM_WIN32_1@        $(__NET_WINCE_SRC_OBJECTS)
  @COND_TOOLKIT_WINCE@__NET_WINCE_SRC_OBJECTS = monodll_net.o
  COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS =  \
         $(__CORE_SRC_OBJECTS) \
  @COND_TOOLKIT_WINCE@__NET_WINCE_SRC_OBJECTS = monodll_net.o
  COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS =  \
         $(__CORE_SRC_OBJECTS) \
@@ -3904,13 +4428,19 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS =  \
         monodll_m_links.o \
         monodll_m_list.o \
         monodll_m_pre.o \
         monodll_m_links.o \
         monodll_m_list.o \
         monodll_m_pre.o \
+       monodll_m_span.o \
         monodll_m_style.o \
         monodll_m_tables.o \
         monodll_m_style.o \
         monodll_m_tables.o \
+       monodll_styleparams.o \
         monodll_winpars.o \
         monodll_htmllbox.o \
         monodll_winpars.o \
         monodll_htmllbox.o \
+       $(__WEBVIEW_SRC_PLATFORM_OBJECTS) \
+       monodll_webview.o \
+       monodll_webviewarchivehandler.o \
         monodll_debugrpt.o \
         monodll_dbgrptg.o \
         monodll_xh_animatctrl.o \
         monodll_debugrpt.o \
         monodll_dbgrptg.o \
         monodll_xh_animatctrl.o \
+       monodll_xh_bannerwindow.o \
         monodll_xh_bmp.o \
         monodll_xh_bmpcbox.o \
         monodll_xh_bmpbt.o \
         monodll_xh_bmp.o \
         monodll_xh_bmpcbox.o \
         monodll_xh_bmpbt.o \
@@ -3921,15 +4451,18 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS =  \
         monodll_xh_choic.o \
         monodll_xh_choicbk.o \
         monodll_xh_clrpicker.o \
         monodll_xh_choic.o \
         monodll_xh_choicbk.o \
         monodll_xh_clrpicker.o \
+       monodll_xh_cmdlinkbn.o \
         monodll_xh_collpane.o \
         monodll_xh_combo.o \
         monodll_xh_collpane.o \
         monodll_xh_combo.o \
+       monodll_xh_comboctrl.o \
         monodll_xh_datectrl.o \
         monodll_xh_dirpicker.o \
         monodll_xh_dlg.o \
         monodll_xh_datectrl.o \
         monodll_xh_dirpicker.o \
         monodll_xh_dlg.o \
-       monodll_xh_frame.o \
-       monodll_xh_mdi.o \
+       monodll_xh_editlbox.o \
+       monodll_xh_filectrl.o \
         monodll_xh_filepicker.o \
         monodll_xh_fontpicker.o \
         monodll_xh_filepicker.o \
         monodll_xh_fontpicker.o \
+       monodll_xh_frame.o \
         monodll_xh_gauge.o \
         monodll_xh_gdctl.o \
         monodll_xh_grid.o \
         monodll_xh_gauge.o \
         monodll_xh_gdctl.o \
         monodll_xh_grid.o \
@@ -3938,6 +4471,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS =  \
         monodll_xh_listb.o \
         monodll_xh_listbk.o \
         monodll_xh_listc.o \
         monodll_xh_listb.o \
         monodll_xh_listbk.o \
         monodll_xh_listc.o \
+       monodll_xh_mdi.o \
         monodll_xh_menu.o \
         monodll_xh_notbk.o \
         monodll_xh_odcombo.o \
         monodll_xh_menu.o \
         monodll_xh_notbk.o \
         monodll_xh_odcombo.o \
@@ -3961,6 +4495,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS =  \
         monodll_xh_text.o \
         monodll_xh_tglbtn.o \
         monodll_xh_toolb.o \
         monodll_xh_text.o \
         monodll_xh_tglbtn.o \
         monodll_xh_toolb.o \
+       monodll_xh_toolbk.o \
         monodll_xh_tree.o \
         monodll_xh_treebk.o \
         monodll_xh_unkwn.o \
         monodll_xh_tree.o \
         monodll_xh_treebk.o \
         monodll_xh_unkwn.o \
@@ -3974,15 +4509,34 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS =  \
         monodll_auibook.o \
         monodll_auibar.o \
         monodll_tabmdi.o \
         monodll_auibook.o \
         monodll_auibar.o \
         monodll_tabmdi.o \
-       monodll_richtextctrl.o \
+       monodll_advprops.o \
+       monodll_editors.o \
+       monodll_manager.o \
+       monodll_property.o \
+       monodll_propgrid.o \
+       monodll_propgridiface.o \
+       monodll_propgridpagestate.o \
+       monodll_props.o \
+       monodll_art_internal.o \
+       monodll_art_msw.o \
+       monodll_art_aui.o \
+       monodll_bar.o \
+       monodll_ribbon_buttonbar.o \
+       monodll_ribbon_control.o \
+       monodll_gallery.o \
+       monodll_page.o \
+       monodll_ribbon_panel.o \
+       monodll_ribbon_toolbar.o \
         monodll_richtextbuffer.o \
         monodll_richtextbuffer.o \
-       monodll_richtextstyles.o \
-       monodll_richtextxml.o \
-       monodll_richtexthtml.o \
+       monodll_richtextctrl.o \
         monodll_richtextformatdlg.o \
         monodll_richtextformatdlg.o \
-       monodll_richtextsymboldlg.o \
-       monodll_richtextstyledlg.o \
+       monodll_richtexthtml.o \
+       monodll_richtextimagedlg.o \
         monodll_richtextprint.o \
         monodll_richtextprint.o \
+       monodll_richtextstyledlg.o \
+       monodll_richtextstyles.o \
+       monodll_richtextsymboldlg.o \
+       monodll_richtextxml.o \
         monodll_stc.o \
         monodll_PlatWX.o \
         monodll_ScintillaWX.o
         monodll_stc.o \
         monodll_PlatWX.o \
         monodll_ScintillaWX.o
@@ -3994,17 +4548,23 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
         monodll_accelcmn.o \
         monodll_accesscmn.o \
         monodll_anidecod.o \
         monodll_accelcmn.o \
         monodll_accesscmn.o \
         monodll_anidecod.o \
+       monodll_affinematrix2d.o \
         monodll_appcmn.o \
         monodll_artprov.o \
         monodll_artstd.o \
         monodll_appcmn.o \
         monodll_artprov.o \
         monodll_artstd.o \
+       monodll_arttango.o \
         monodll_bmpbase.o \
         monodll_bmpbase.o \
+       monodll_bmpbtncmn.o \
         monodll_bookctrl.o \
         monodll_btncmn.o \
         monodll_cairo.o \
         monodll_bookctrl.o \
         monodll_btncmn.o \
         monodll_cairo.o \
+       monodll_checkboxcmn.o \
+       monodll_checklstcmn.o \
         monodll_choiccmn.o \
         monodll_clipcmn.o \
         monodll_clrpickercmn.o \
         monodll_colourcmn.o \
         monodll_choiccmn.o \
         monodll_clipcmn.o \
         monodll_clrpickercmn.o \
         monodll_colourcmn.o \
+       monodll_colourdata.o \
         monodll_combocmn.o \
         monodll_cmdproc.o \
         monodll_cmndata.o \
         monodll_combocmn.o \
         monodll_cmdproc.o \
         monodll_cmndata.o \
@@ -4012,11 +4572,11 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
         monodll_cshelp.o \
         monodll_ctrlcmn.o \
         monodll_ctrlsub.o \
         monodll_cshelp.o \
         monodll_ctrlcmn.o \
         monodll_ctrlsub.o \
-       monodll_datacmn.o \
         monodll_dcbase.o \
         monodll_dcbufcmn.o \
         monodll_dcgraph.o \
         monodll_dcsvg.o \
         monodll_dcbase.o \
         monodll_dcbufcmn.o \
         monodll_dcgraph.o \
         monodll_dcsvg.o \
+       monodll_dirctrlcmn.o \
         monodll_dlgcmn.o \
         monodll_dndcmn.o \
         monodll_dobjcmn.o \
         monodll_dlgcmn.o \
         monodll_dndcmn.o \
         monodll_dobjcmn.o \
@@ -4027,10 +4587,13 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
         monodll_effects.o \
         monodll_fddlgcmn.o \
         monodll_filectrlcmn.o \
         monodll_effects.o \
         monodll_fddlgcmn.o \
         monodll_filectrlcmn.o \
+       monodll_filehistorycmn.o \
         monodll_filepickercmn.o \
         monodll_fontpickercmn.o \
         monodll_fldlgcmn.o \
         monodll_fontcmn.o \
         monodll_filepickercmn.o \
         monodll_fontpickercmn.o \
         monodll_fldlgcmn.o \
         monodll_fontcmn.o \
+       monodll_fontdata.o \
+       monodll_graphicc.o \
         monodll_fontenumcmn.o \
         monodll_fontmap.o \
         monodll_fontutilcmn.o \
         monodll_fontenumcmn.o \
         monodll_fontmap.o \
         monodll_fontutilcmn.o \
@@ -4041,6 +4604,8 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
         monodll_geometry.o \
         monodll_gifdecod.o \
         monodll_graphcmn.o \
         monodll_geometry.o \
         monodll_gifdecod.o \
         monodll_graphcmn.o \
+       monodll_headercolcmn.o \
+       monodll_headerctrlcmn.o \
         monodll_helpbase.o \
         monodll_iconbndl.o \
         monodll_imagall.o \
         monodll_helpbase.o \
         monodll_iconbndl.o \
         monodll_imagall.o \
@@ -4059,22 +4624,36 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
         monodll_layout.o \
         monodll_lboxcmn.o \
         monodll_listctrlcmn.o \
         monodll_layout.o \
         monodll_lboxcmn.o \
         monodll_listctrlcmn.o \
+       monodll_markupparser.o \
         monodll_matrix.o \
         monodll_menucmn.o \
         monodll_matrix.o \
         monodll_menucmn.o \
+       monodll_mousemanager.o \
         monodll_nbkbase.o \
         monodll_overlaycmn.o \
         monodll_nbkbase.o \
         monodll_overlaycmn.o \
+       monodll_ownerdrwcmn.o \
         monodll_paper.o \
         monodll_paper.o \
+       monodll_panelcmn.o \
+       monodll_persist.o \
         monodll_pickerbase.o \
         monodll_popupcmn.o \
         monodll_prntbase.o \
         monodll_quantize.o \
         monodll_pickerbase.o \
         monodll_popupcmn.o \
         monodll_prntbase.o \
         monodll_quantize.o \
+       monodll_radiobtncmn.o \
         monodll_radiocmn.o \
         monodll_radiocmn.o \
+       monodll_rearrangectrl.o \
         monodll_rendcmn.o \
         monodll_rgncmn.o \
         monodll_rendcmn.o \
         monodll_rgncmn.o \
+       monodll_scrolbarcmn.o \
         monodll_settcmn.o \
         monodll_sizer.o \
         monodll_settcmn.o \
         monodll_sizer.o \
+       monodll_slidercmn.o \
+       monodll_spinbtncmn.o \
+       monodll_spinctrlcmn.o \
         monodll_srchcmn.o \
         monodll_statbar.o \
         monodll_srchcmn.o \
         monodll_statbar.o \
+       monodll_statbmpcmn.o \
+       monodll_statboxcmn.o \
+       monodll_statlinecmn.o \
         monodll_stattextcmn.o \
         monodll_stockitem.o \
         monodll_tbarbase.o \
         monodll_stattextcmn.o \
         monodll_stockitem.o \
         monodll_tbarbase.o \
@@ -4082,15 +4661,17 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
         monodll_textentrycmn.o \
         monodll_toplvcmn.o \
         monodll_treebase.o \
         monodll_textentrycmn.o \
         monodll_toplvcmn.o \
         monodll_treebase.o \
+       monodll_uiactioncmn.o \
         monodll_valgen.o \
         monodll_validate.o \
         monodll_valtext.o \
         monodll_valgen.o \
         monodll_validate.o \
         monodll_valtext.o \
+       monodll_valnum.o \
         monodll_wincmn.o \
         monodll_windowid.o \
         monodll_wrapsizer.o \
         monodll_xpmdecod.o \
         monodll_busyinfo.o \
         monodll_wincmn.o \
         monodll_windowid.o \
         monodll_wrapsizer.o \
         monodll_xpmdecod.o \
         monodll_busyinfo.o \
-       monodll_buttonbar.o \
+       monodll_generic_buttonbar.o \
         monodll_choicdgg.o \
         monodll_choicbkg.o \
         monodll_combog.o \
         monodll_choicdgg.o \
         monodll_choicbkg.o \
         monodll_combog.o \
@@ -4098,19 +4679,25 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
         monodll_dirctrlg.o \
         monodll_dragimgg.o \
         monodll_filectrlg.o \
         monodll_dirctrlg.o \
         monodll_dragimgg.o \
         monodll_filectrlg.o \
+       monodll_headerctrlg.o \
+       monodll_generic_infobar.o \
         monodll_listbkg.o \
         monodll_logg.o \
         monodll_listbkg.o \
         monodll_logg.o \
+       monodll_markuptext.o \
+       monodll_msgdlgg.o \
         monodll_numdlgg.o \
         monodll_panelg.o \
         monodll_progdlgg.o \
         monodll_printps.o \
         monodll_renderg.o \
         monodll_numdlgg.o \
         monodll_panelg.o \
         monodll_progdlgg.o \
         monodll_printps.o \
         monodll_renderg.o \
+       monodll_richmsgdlgg.o \
         monodll_scrlwing.o \
         monodll_selstore.o \
         monodll_spinctlg.o \
         monodll_splitter.o \
         monodll_srchctlg.o \
         monodll_statbmpg.o \
         monodll_scrlwing.o \
         monodll_selstore.o \
         monodll_spinctlg.o \
         monodll_splitter.o \
         monodll_srchctlg.o \
         monodll_statbmpg.o \
+       monodll_stattextg.o \
         monodll_textdlgg.o \
         monodll_tipwin.o \
         monodll_toolbkg.o \
         monodll_textdlgg.o \
         monodll_tipwin.o \
         monodll_toolbkg.o \
@@ -4122,55 +4709,53 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
  COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
         $(__LOWLEVEL_SRC_OBJECTS_1) \
         $(__PLATFORM_SRC_OBJECTS) \
  COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
         $(__LOWLEVEL_SRC_OBJECTS_1) \
         $(__PLATFORM_SRC_OBJECTS) \
-       monodll_accel.o \
+       monodll_generic_accel.o \
         monodll_clrpickerg.o \
         monodll_collpaneg.o \
         monodll_colrdlgg.o \
         monodll_dirdlgg.o \
         monodll_clrpickerg.o \
         monodll_collpaneg.o \
         monodll_colrdlgg.o \
         monodll_dirdlgg.o \
-       monodll_fdrepdlg.o \
+       monodll_generic_fdrepdlg.o \
         monodll_filedlgg.o \
         monodll_filepickerg.o \
         monodll_fontdlgg.o \
         monodll_fontpickerg.o \
         monodll_filedlgg.o \
         monodll_filepickerg.o \
         monodll_fontdlgg.o \
         monodll_fontpickerg.o \
-       monodll_listctrl.o \
+       monodll_generic_listctrl.o \
         monodll_mdig.o \
         monodll_mdig.o \
-       monodll_msgdlgg.o \
         monodll_prntdlgg.o \
         monodll_prntdlgg.o \
-       monodll_tabg.o \
-       monodll_bmpbuttn.o \
-       monodll_button.o \
-       monodll_checkbox.o \
-       monodll_checklst.o \
-       monodll_choice.o \
-       monodll_combobox.o \
-       monodll_control.o \
+       monodll_univ_bmpbuttn.o \
+       monodll_univ_button.o \
+       monodll_univ_checkbox.o \
+       monodll_univ_checklst.o \
+       monodll_univ_choice.o \
+       monodll_univ_combobox.o \
+       monodll_univ_control.o \
         monodll_ctrlrend.o \
         monodll_ctrlrend.o \
-       monodll_dialog.o \
+       monodll_univ_dialog.o \
         monodll_framuniv.o \
         monodll_framuniv.o \
-       monodll_gauge.o \
+       monodll_univ_gauge.o \
         monodll_inpcons.o \
         monodll_inphand.o \
         monodll_inpcons.o \
         monodll_inphand.o \
-       monodll_listbox.o \
-       monodll_menu.o \
-       monodll_notebook.o \
-       monodll_radiobox.o \
-       monodll_radiobut.o \
+       monodll_univ_listbox.o \
+       monodll_univ_menu.o \
+       monodll_univ_notebook.o \
+       monodll_univ_radiobox.o \
+       monodll_univ_radiobut.o \
         monodll_scrarrow.o \
         monodll_scrarrow.o \
-       monodll_scrolbar.o \
+       monodll_univ_scrolbar.o \
         monodll_scrthumb.o \
         monodll_settingsuniv.o \
         monodll_scrthumb.o \
         monodll_settingsuniv.o \
-       monodll_slider.o \
-       monodll_spinbutt.o \
-       monodll_statbmp.o \
-       monodll_statbox.o \
-       monodll_statline.o \
-       monodll_stattext.o \
-       monodll_statusbr.o \
+       monodll_univ_slider.o \
+       monodll_univ_spinbutt.o \
+       monodll_univ_statbmp.o \
+       monodll_univ_statbox.o \
+       monodll_univ_statline.o \
+       monodll_univ_stattext.o \
+       monodll_univ_statusbr.o \
         monodll_stdrend.o \
         monodll_stdrend.o \
-       monodll_textctrl.o \
-       monodll_tglbtn.o \
+       monodll_univ_textctrl.o \
+       monodll_univ_tglbtn.o \
         monodll_theme.o \
         monodll_theme.o \
-       monodll_toolbar.o \
+       monodll_univ_toolbar.o \
         monodll_topluniv.o \
         monodll_winuniv.o \
         monodll_gtk.o \
         monodll_topluniv.o \
         monodll_winuniv.o \
         monodll_gtk.o \
@@ -4180,17 +4765,23 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
         monodll_accelcmn.o \
         monodll_accesscmn.o \
         monodll_anidecod.o \
         monodll_accelcmn.o \
         monodll_accesscmn.o \
         monodll_anidecod.o \
+       monodll_affinematrix2d.o \
         monodll_appcmn.o \
         monodll_artprov.o \
         monodll_artstd.o \
         monodll_appcmn.o \
         monodll_artprov.o \
         monodll_artstd.o \
+       monodll_arttango.o \
         monodll_bmpbase.o \
         monodll_bmpbase.o \
+       monodll_bmpbtncmn.o \
         monodll_bookctrl.o \
         monodll_btncmn.o \
         monodll_cairo.o \
         monodll_bookctrl.o \
         monodll_btncmn.o \
         monodll_cairo.o \
+       monodll_checkboxcmn.o \
+       monodll_checklstcmn.o \
         monodll_choiccmn.o \
         monodll_clipcmn.o \
         monodll_clrpickercmn.o \
         monodll_colourcmn.o \
         monodll_choiccmn.o \
         monodll_clipcmn.o \
         monodll_clrpickercmn.o \
         monodll_colourcmn.o \
+       monodll_colourdata.o \
         monodll_combocmn.o \
         monodll_cmdproc.o \
         monodll_cmndata.o \
         monodll_combocmn.o \
         monodll_cmdproc.o \
         monodll_cmndata.o \
@@ -4198,11 +4789,11 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
         monodll_cshelp.o \
         monodll_ctrlcmn.o \
         monodll_ctrlsub.o \
         monodll_cshelp.o \
         monodll_ctrlcmn.o \
         monodll_ctrlsub.o \
-       monodll_datacmn.o \
         monodll_dcbase.o \
         monodll_dcbufcmn.o \
         monodll_dcgraph.o \
         monodll_dcsvg.o \
         monodll_dcbase.o \
         monodll_dcbufcmn.o \
         monodll_dcgraph.o \
         monodll_dcsvg.o \
+       monodll_dirctrlcmn.o \
         monodll_dlgcmn.o \
         monodll_dndcmn.o \
         monodll_dobjcmn.o \
         monodll_dlgcmn.o \
         monodll_dndcmn.o \
         monodll_dobjcmn.o \
@@ -4213,10 +4804,13 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
         monodll_effects.o \
         monodll_fddlgcmn.o \
         monodll_filectrlcmn.o \
         monodll_effects.o \
         monodll_fddlgcmn.o \
         monodll_filectrlcmn.o \
+       monodll_filehistorycmn.o \
         monodll_filepickercmn.o \
         monodll_fontpickercmn.o \
         monodll_fldlgcmn.o \
         monodll_fontcmn.o \
         monodll_filepickercmn.o \
         monodll_fontpickercmn.o \
         monodll_fldlgcmn.o \
         monodll_fontcmn.o \
+       monodll_fontdata.o \
+       monodll_graphicc.o \
         monodll_fontenumcmn.o \
         monodll_fontmap.o \
         monodll_fontutilcmn.o \
         monodll_fontenumcmn.o \
         monodll_fontmap.o \
         monodll_fontutilcmn.o \
@@ -4227,6 +4821,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
         monodll_geometry.o \
         monodll_gifdecod.o \
         monodll_graphcmn.o \
         monodll_geometry.o \
         monodll_gifdecod.o \
         monodll_graphcmn.o \
+       monodll_headercolcmn.o \
+       monodll_headerctrlcmn.o \
         monodll_helpbase.o \
         monodll_iconbndl.o \
         monodll_imagall.o \
         monodll_helpbase.o \
         monodll_iconbndl.o \
         monodll_imagall.o \
@@ -4245,22 +4841,36 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
         monodll_layout.o \
         monodll_lboxcmn.o \
         monodll_listctrlcmn.o \
         monodll_layout.o \
         monodll_lboxcmn.o \
         monodll_listctrlcmn.o \
+       monodll_markupparser.o \
         monodll_matrix.o \
         monodll_menucmn.o \
         monodll_matrix.o \
         monodll_menucmn.o \
+       monodll_mousemanager.o \
         monodll_nbkbase.o \
         monodll_overlaycmn.o \
         monodll_nbkbase.o \
         monodll_overlaycmn.o \
+       monodll_ownerdrwcmn.o \
         monodll_paper.o \
         monodll_paper.o \
+       monodll_panelcmn.o \
+       monodll_persist.o \
         monodll_pickerbase.o \
         monodll_popupcmn.o \
         monodll_prntbase.o \
         monodll_quantize.o \
         monodll_pickerbase.o \
         monodll_popupcmn.o \
         monodll_prntbase.o \
         monodll_quantize.o \
+       monodll_radiobtncmn.o \
         monodll_radiocmn.o \
         monodll_radiocmn.o \
+       monodll_rearrangectrl.o \
         monodll_rendcmn.o \
         monodll_rgncmn.o \
         monodll_rendcmn.o \
         monodll_rgncmn.o \
+       monodll_scrolbarcmn.o \
         monodll_settcmn.o \
         monodll_sizer.o \
         monodll_settcmn.o \
         monodll_sizer.o \
+       monodll_slidercmn.o \
+       monodll_spinbtncmn.o \
+       monodll_spinctrlcmn.o \
         monodll_srchcmn.o \
         monodll_statbar.o \
         monodll_srchcmn.o \
         monodll_statbar.o \
+       monodll_statbmpcmn.o \
+       monodll_statboxcmn.o \
+       monodll_statlinecmn.o \
         monodll_stattextcmn.o \
         monodll_stockitem.o \
         monodll_tbarbase.o \
         monodll_stattextcmn.o \
         monodll_stockitem.o \
         monodll_tbarbase.o \
@@ -4268,15 +4878,17 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
         monodll_textentrycmn.o \
         monodll_toplvcmn.o \
         monodll_treebase.o \
         monodll_textentrycmn.o \
         monodll_toplvcmn.o \
         monodll_treebase.o \
+       monodll_uiactioncmn.o \
         monodll_valgen.o \
         monodll_validate.o \
         monodll_valtext.o \
         monodll_valgen.o \
         monodll_validate.o \
         monodll_valtext.o \
+       monodll_valnum.o \
         monodll_wincmn.o \
         monodll_windowid.o \
         monodll_wrapsizer.o \
         monodll_xpmdecod.o \
         monodll_busyinfo.o \
         monodll_wincmn.o \
         monodll_windowid.o \
         monodll_wrapsizer.o \
         monodll_xpmdecod.o \
         monodll_busyinfo.o \
-       monodll_buttonbar.o \
+       monodll_generic_buttonbar.o \
         monodll_choicdgg.o \
         monodll_choicbkg.o \
         monodll_combog.o \
         monodll_choicdgg.o \
         monodll_choicbkg.o \
         monodll_combog.o \
@@ -4284,19 +4896,25 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
         monodll_dirctrlg.o \
         monodll_dragimgg.o \
         monodll_filectrlg.o \
         monodll_dirctrlg.o \
         monodll_dragimgg.o \
         monodll_filectrlg.o \
+       monodll_headerctrlg.o \
+       monodll_generic_infobar.o \
         monodll_listbkg.o \
         monodll_logg.o \
         monodll_listbkg.o \
         monodll_logg.o \
+       monodll_markuptext.o \
+       monodll_msgdlgg.o \
         monodll_numdlgg.o \
         monodll_panelg.o \
         monodll_progdlgg.o \
         monodll_printps.o \
         monodll_renderg.o \
         monodll_numdlgg.o \
         monodll_panelg.o \
         monodll_progdlgg.o \
         monodll_printps.o \
         monodll_renderg.o \
+       monodll_richmsgdlgg.o \
         monodll_scrlwing.o \
         monodll_selstore.o \
         monodll_spinctlg.o \
         monodll_splitter.o \
         monodll_srchctlg.o \
         monodll_statbmpg.o \
         monodll_scrlwing.o \
         monodll_selstore.o \
         monodll_spinctlg.o \
         monodll_splitter.o \
         monodll_srchctlg.o \
         monodll_statbmpg.o \
+       monodll_stattextg.o \
         monodll_textdlgg.o \
         monodll_tipwin.o \
         monodll_toolbkg.o \
         monodll_textdlgg.o \
         monodll_tipwin.o \
         monodll_toolbkg.o \
@@ -4309,209 +4927,214 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
  @COND_TOOLKIT_COCOA@   monodll_hid.o monodll_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS =  \
         monodll_fontmgrcmn.o \
  @COND_TOOLKIT_COCOA@   monodll_hid.o monodll_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS =  \
         monodll_fontmgrcmn.o \
-       monodll_caret.o \
-       monodll_colour.o \
-       monodll_icon.o \
-       monodll_imaglist.o \
+       monodll_generic_caret.o \
+       monodll_generic_colour.o \
+       monodll_generic_icon.o \
+       monodll_generic_imaglist.o \
         monodll_mask.o \
         monodll_mask.o \
-       monodll_timer.o \
-       monodll_app.o \
-       monodll_bitmap.o \
-       monodll_brush.o \
-       monodll_cursor.o \
-       monodll_dc.o \
-       monodll_dcclient.o \
-       monodll_dcmemory.o \
-       monodll_dcscreen.o \
-       monodll_evtloop.o \
-       monodll_font.o \
-       monodll_fontenum.o \
-       monodll_fontmgr.o \
-       monodll_nonownedwnd.o \
-       monodll_overlay.o \
-       monodll_pen.o \
-       monodll_region.o \
-       monodll_settings.o \
-       monodll_toplevel.o \
-       monodll_utils.o \
-       monodll_window.o \
+       monodll_dfb_app.o \
+       monodll_dfb_bitmap.o \
+       monodll_dfb_brush.o \
+       monodll_dfb_cursor.o \
+       monodll_dfb_dc.o \
+       monodll_dfb_dcclient.o \
+       monodll_dfb_dcmemory.o \
+       monodll_dfb_dcscreen.o \
+       monodll_dfb_evtloop.o \
+       monodll_dfb_font.o \
+       monodll_dfb_fontenum.o \
+       monodll_dfb_fontmgr.o \
+       monodll_dfb_nonownedwnd.o \
+       monodll_dfb_overlay.o \
+       monodll_dfb_pen.o \
+       monodll_dfb_region.o \
+       monodll_dfb_settings.o \
+       monodll_dfb_toplevel.o \
+       monodll_dfb_utils.o \
+       monodll_dfb_window.o \
         monodll_wrapdfb.o
  @COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS =  \
         monodll_wrapdfb.o
  @COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS =  \
-       monodll_caret.o \
-       monodll_imaglist.o \
-       monodll_dialup.o \
-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_utilsx11.o \
+       monodll_generic_caret.o \
+       monodll_generic_imaglist.o \
+       monodll_unix_dialup.o \
         monodll_displayx11.o \
         monodll_displayx11.o \
-       monodll_icon.o \
+       monodll_unix_fontenum.o \
+       monodll_unix_fontutil.o \
+       monodll_uiactionx11.o \
+       monodll_utilsx11.o \
+       monodll_generic_icon.o \
         monodll_paletteg.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_gsockgtk.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
+       monodll_gtk1_app.o \
+       monodll_gtk1_bitmap.o \
+       monodll_gtk1_brush.o \
+       monodll_gtk1_clipbrd.o \
+       monodll_gtk1_colour.o \
+       monodll_gtk1_cursor.o \
+       monodll_gtk1_data.o \
+       monodll_gtk1_dataobj.o \
+       monodll_gtk1_dc.o \
+       monodll_gtk1_dcclient.o \
+       monodll_gtk1_dcmemory.o \
+       monodll_gtk1_dcscreen.o \
+       monodll_gtk1_dnd.o \
+       monodll_gtk1_evtloop.o \
+       monodll_gtk1_font.o \
+       monodll_gtk1_sockgtk.o \
+       monodll_gtk1_main.o \
+       monodll_gtk1_minifram.o \
+       monodll_gtk1_pen.o \
+       monodll_gtk1_popupwin.o \
+       monodll_gtk1_region.o \
+       monodll_gtk1_renderer.o \
+       monodll_gtk1_settings.o \
+       monodll_gtk1_timer.o \
+       monodll_gtk1_tooltip.o \
+       monodll_gtk1_toplevel.o \
+       monodll_gtk1_utilsgtk.o \
+       monodll_gtk1_win_gtk.o \
+       monodll_gtk1_window.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS =  \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS =  \
-       monodll_caret.o \
-       monodll_imaglist.o \
-       monodll_dialup.o \
-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_utilsx11.o \
+       monodll_generic_caret.o \
+       monodll_generic_imaglist.o \
+       monodll_unix_dialup.o \
         monodll_displayx11.o \
         monodll_displayx11.o \
-       monodll_icon.o \
+       monodll_unix_fontenum.o \
+       monodll_unix_fontutil.o \
+       monodll_uiactionx11.o \
+       monodll_utilsx11.o \
+       monodll_generic_icon.o \
         monodll_paletteg.o \
         monodll_paletteg.o \
-       monodll_app.o \
+       monodll_gtk_app.o \
         monodll_assertdlg_gtk.o \
         monodll_assertdlg_gtk.o \
-       monodll_bitmap.o \
-       monodll_brush.o \
-       monodll_clipbrd.o \
-       monodll_colour.o \
-       monodll_cursor.o \
-       monodll_dataobj.o \
-       monodll_dc.o \
-       monodll_dcclient.o \
-       monodll_dcmemory.o \
-       monodll_dcscreen.o \
-       monodll_dnd.o \
-       monodll_evtloop.o \
+       monodll_gtk_bitmap.o \
+       monodll_gtk_brush.o \
+       monodll_gtk_clipbrd.o \
+       monodll_gtk_colour.o \
+       monodll_gtk_cursor.o \
+       monodll_gtk_dataobj.o \
+       monodll_gtk_dc.o \
+       monodll_gtk_dcclient.o \
+       monodll_gtk_dcmemory.o \
+       monodll_gtk_dcscreen.o \
+       monodll_gtk_dnd.o \
+       monodll_gtk_evtloop.o \
         monodll_filectrl.o \
         monodll_filectrl.o \
-       monodll_font.o \
-       monodll_gsockgtk.o \
-       monodll_minifram.o \
-       monodll_pen.o \
-       monodll_popupwin.o \
+       monodll_filehistory.o \
+       monodll_gtk_font.o \
+       monodll_gtk_sockgtk.o \
+       monodll_gtk_minifram.o \
+       monodll_gtk_pen.o \
+       monodll_gtk_popupwin.o \
         monodll_private.o \
         monodll_private.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
+       monodll_gtk_region.o \
+       monodll_gtk_renderer.o \
+       monodll_gtk_settings.o \
+       monodll_gtk_timer.o \
+       monodll_gtk_tooltip.o \
+       monodll_gtk_toplevel.o \
+       monodll_gtk_utilsgtk.o \
+       monodll_gtk_win_gtk.o \
+       monodll_gtk_window.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS =  \
         monodll_fontmgrcmn.o \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS =  \
         monodll_fontmgrcmn.o \
-       monodll_caret.o \
-       monodll_colour.o \
-       monodll_icon.o \
-       monodll_imaglist.o \
+       monodll_generic_caret.o \
+       monodll_generic_colour.o \
+       monodll_generic_icon.o \
+       monodll_generic_imaglist.o \
         monodll_mask.o \
         monodll_mask.o \
-       monodll_timer.o \
-       monodll_app.o \
-       monodll_bitmap.o \
-       monodll_brush.o \
-       monodll_clipbrd.o \
-       monodll_cursor.o \
-       monodll_data.o \
-       monodll_dc.o \
-       monodll_dcclient.o \
-       monodll_dcmemory.o \
-       monodll_dcscreen.o \
+       monodll_generic_timer.o \
+       monodll_mgl_app.o \
+       monodll_mgl_bitmap.o \
+       monodll_mgl_brush.o \
+       monodll_mgl_clipbrd.o \
+       monodll_mgl_cursor.o \
+       monodll_mgl_data.o \
+       monodll_mgl_dc.o \
+       monodll_mgl_dcclient.o \
+       monodll_mgl_dcmemory.o \
+       monodll_mgl_dcscreen.o \
         monodll_dirmgl.o \
         monodll_dirmgl.o \
-       monodll_evtloop.o \
-       monodll_font.o \
-       monodll_fontenum.o \
-       monodll_fontmgr.o \
-       monodll_fontutil.o \
-       monodll_palette.o \
-       monodll_pen.o \
-       monodll_region.o \
-       monodll_settings.o \
-       monodll_toplevel.o \
-       monodll_utils.o \
-       monodll_window.o
+       monodll_mgl_evtloop.o \
+       monodll_mgl_font.o \
+       monodll_mgl_fontenum.o \
+       monodll_mgl_fontmgr.o \
+       monodll_mgl_fontutil.o \
+       monodll_mgl_palette.o \
+       monodll_mgl_pen.o \
+       monodll_mgl_region.o \
+       monodll_mgl_settings.o \
+       monodll_mgl_toplevel.o \
+       monodll_mgl_utils.o \
+       monodll_mgl_window.o
  @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS)
  COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS =  \
  @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS)
  COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS =  \
-       monodll_caret.o \
-       monodll_imaglist.o \
-       monodll_dialup.o \
-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_utilsx11.o \
+       monodll_generic_caret.o \
+       monodll_generic_imaglist.o \
+       monodll_unix_dialup.o \
         monodll_displayx11.o \
         monodll_displayx11.o \
-       monodll_bitmap.o \
-       monodll_brush.o \
-       monodll_palette.o \
-       monodll_pen.o \
-       monodll_region.o \
+       monodll_unix_fontenum.o \
+       monodll_unix_fontutil.o \
+       monodll_uiactionx11.o \
+       monodll_utilsx11.o \
+       monodll_x11_bitmap.o \
+       monodll_x11_brush.o \
+       monodll_x11_palette.o \
+       monodll_x11_pen.o \
+       monodll_x11_region.o \
         monodll_utilsx.o
  @COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS)
  COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS =  \
         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_activex.o \
+       monodll_msw_app.o \
+       monodll_msw_bitmap.o \
+       monodll_msw_brush.o \
+       monodll_msw_caret.o \
+       monodll_msw_clipbrd.o \
+       monodll_msw_colour.o \
+       monodll_msw_cursor.o \
+       monodll_msw_data.o \
+       monodll_msw_dc.o \
+       monodll_msw_dcclient.o \
+       monodll_msw_dcmemory.o \
+       monodll_msw_dcprint.o \
+       monodll_msw_dcscreen.o \
+       monodll_msw_dialup.o \
         monodll_dib.o \
         monodll_dib.o \
-       monodll_display.o \
+       monodll_msw_display.o \
         monodll_enhmeta.o \
         monodll_enhmeta.o \
-       monodll_font.o \
-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_gdiimage.o \
-       monodll_gdiobj.o \
+       monodll_msw_font.o \
+       monodll_msw_fontenum.o \
+       monodll_msw_fontutil.o \
+       monodll_msw_gdiimage.o \
+       monodll_msw_gdiobj.o \
         monodll_gdiplus.o \
         monodll_gdiplus.o \
-       monodll_graphics.o \
-       monodll_icon.o \
-       monodll_imaglist.o \
-       monodll_minifram.o \
-       monodll_dataobj.o \
+       monodll_msw_graphics.o \
+       monodll_msw_icon.o \
+       monodll_msw_imaglist.o \
+       monodll_msw_minifram.o \
+       monodll_ole_dataobj.o \
         monodll_dropsrc.o \
         monodll_droptgt.o \
         monodll_oleutils.o \
         monodll_dropsrc.o \
         monodll_droptgt.o \
         monodll_oleutils.o \
-       monodll_palette.o \
-       monodll_pen.o \
-       monodll_popupwin.o \
-       monodll_printdlg.o \
+       monodll_msw_palette.o \
+       monodll_msw_pen.o \
+       monodll_msw_popupwin.o \
+       monodll_msw_printdlg.o \
         monodll_printwin.o \
         monodll_printwin.o \
-       monodll_region.o \
-       monodll_renderer.o \
-       monodll_settings.o \
-       monodll_tooltip.o \
-       monodll_toplevel.o \
-       monodll_utilsgui.o \
+       monodll_msw_region.o \
+       monodll_msw_renderer.o \
+       monodll_msw_settings.o \
+       monodll_msw_tooltip.o \
+       monodll_msw_toplevel.o \
+       monodll_uiaction.o \
+       monodll_msw_utilsgui.o \
         monodll_uxtheme.o \
         monodll_uxtheme.o \
-       monodll_window.o \
+       monodll_msw_window.o \
         monodll_helpchm.o \
         monodll_helpchm.o \
-       monodll_helpwin.o \
+       monodll_msw_helpwin.o \
         monodll_automtn.o \
         monodll_uuid.o
  @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS)
         monodll_automtn.o \
         monodll_uuid.o
  @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS)
@@ -4519,89 +5142,94 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS =  \
  @COND_TOOLKIT_OSX_CARBON@      $(__OSX_LOWLEVEL_SRC_OBJECTS)
  @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS = \
  @COND_TOOLKIT_OSX_COCOA@       $(__OSX_LOWLEVEL_SRC_OBJECTS)
  @COND_TOOLKIT_OSX_CARBON@      $(__OSX_LOWLEVEL_SRC_OBJECTS)
  @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS = \
  @COND_TOOLKIT_OSX_COCOA@       $(__OSX_LOWLEVEL_SRC_OBJECTS)
+@COND_TOOLKIT_OSX_IPHONE@__LOWLEVEL_SRC_OBJECTS = \
+@COND_TOOLKIT_OSX_IPHONE@      $(__OSX_LOWLEVEL_SRC_OBJECTS)
  @COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS = 
  COND_TOOLKIT_WINCE___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_activex.o \
+       monodll_msw_app.o \
+       monodll_msw_bitmap.o \
+       monodll_msw_brush.o \
+       monodll_msw_caret.o \
+       monodll_msw_clipbrd.o \
+       monodll_msw_colour.o \
+       monodll_msw_cursor.o \
+       monodll_msw_data.o \
+       monodll_msw_dc.o \
+       monodll_msw_dcclient.o \
+       monodll_msw_dcmemory.o \
+       monodll_msw_dcprint.o \
+       monodll_msw_dcscreen.o \
+       monodll_msw_dialup.o \
         monodll_dib.o \
         monodll_dib.o \
-       monodll_display.o \
+       monodll_msw_display.o \
         monodll_enhmeta.o \
         monodll_enhmeta.o \
-       monodll_font.o \
-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_gdiimage.o \
-       monodll_gdiobj.o \
+       monodll_msw_font.o \
+       monodll_msw_fontenum.o \
+       monodll_msw_fontutil.o \
+       monodll_msw_gdiimage.o \
+       monodll_msw_gdiobj.o \
         monodll_gdiplus.o \
         monodll_gdiplus.o \
-       monodll_graphics.o \
-       monodll_icon.o \
-       monodll_imaglist.o \
-       monodll_minifram.o \
-       monodll_dataobj.o \
+       monodll_msw_graphics.o \
+       monodll_msw_icon.o \
+       monodll_msw_imaglist.o \
+       monodll_msw_minifram.o \
+       monodll_ole_dataobj.o \
         monodll_dropsrc.o \
         monodll_droptgt.o \
         monodll_oleutils.o \
         monodll_dropsrc.o \
         monodll_droptgt.o \
         monodll_oleutils.o \
-       monodll_palette.o \
-       monodll_pen.o \
-       monodll_popupwin.o \
-       monodll_printdlg.o \
+       monodll_msw_palette.o \
+       monodll_msw_pen.o \
+       monodll_msw_popupwin.o \
+       monodll_msw_printdlg.o \
         monodll_printwin.o \
         monodll_printwin.o \
-       monodll_region.o \
-       monodll_renderer.o \
-       monodll_settings.o \
-       monodll_tooltip.o \
-       monodll_toplevel.o \
-       monodll_utilsgui.o \
+       monodll_msw_region.o \
+       monodll_msw_renderer.o \
+       monodll_msw_settings.o \
+       monodll_msw_tooltip.o \
+       monodll_msw_toplevel.o \
+       monodll_uiaction.o \
+       monodll_msw_utilsgui.o \
         monodll_uxtheme.o \
         monodll_uxtheme.o \
-       monodll_window.o
+       monodll_msw_window.o
  @COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS)
  COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS =  \
  @COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS)
  COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS =  \
-       monodll_caret.o \
-       monodll_imaglist.o \
-       monodll_dialup.o \
-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_utilsx11.o \
+       monodll_generic_caret.o \
+       monodll_generic_imaglist.o \
+       monodll_unix_dialup.o \
         monodll_displayx11.o \
         monodll_displayx11.o \
-       monodll_icon.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_minifram.o \
+       monodll_unix_fontenum.o \
+       monodll_unix_fontutil.o \
+       monodll_uiactionx11.o \
+       monodll_utilsx11.o \
+       monodll_generic_icon.o \
+       monodll_generic_timer.o \
+       monodll_x11_app.o \
+       monodll_x11_bitmap.o \
+       monodll_x11_brush.o \
+       monodll_x11_clipbrd.o \
+       monodll_x11_colour.o \
+       monodll_x11_cursor.o \
+       monodll_x11_data.o \
+       monodll_x11_dataobj.o \
+       monodll_x11_dc.o \
+       monodll_x11_dcclient.o \
+       monodll_x11_dcmemory.o \
+       monodll_x11_dcscreen.o \
+       monodll_x11_evtloop.o \
+       monodll_x11_font.o \
+       monodll_x11_minifram.o \
         monodll_nanox.o \
         monodll_nanox.o \
-       monodll_palette.o \
-       monodll_pen.o \
-       monodll_popupwin.o \
-       monodll_region.o \
+       monodll_x11_palette.o \
+       monodll_x11_pen.o \
+       monodll_x11_popupwin.o \
+       monodll_x11_region.o \
         monodll_reparent.o \
         monodll_reparent.o \
-       monodll_settings.o \
-       monodll_toplevel.o \
-       monodll_utils.o \
+       monodll_x11_settings.o \
+       monodll_x11_toplevel.o \
+       monodll_x11_utils.o \
         monodll_utilsx.o \
         monodll_utilsx.o \
-       monodll_window.o
+       monodll_x11_window.o
  @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS)
  COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS =  \
         monodll_NSBox.o \
  @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS)
  COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS =  \
         monodll_NSBox.o \
@@ -4617,256 +5245,252 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS =  \
         monodll_NSView.o \
         monodll_NSWindow.o \
         monodll_ObjcRef.o \
         monodll_NSView.o \
         monodll_NSWindow.o \
         monodll_ObjcRef.o \
-       monodll_app.o \
-       monodll_bitmap.o \
-       monodll_bmpbuttn.o \
-       monodll_brush.o \
-       monodll_button.o \
-       monodll_checkbox.o \
-       monodll_checklst.o \
-       monodll_choice.o \
-       monodll_clipbrd.o \
-       monodll_colordlg.o \
-       monodll_colour.o \
-       monodll_combobox.o \
-       monodll_control.o \
-       monodll_cursor.o \
-       monodll_data.o \
-       monodll_dataobj.o \
-       monodll_dc.o \
-       monodll_dcclient.o \
-       monodll_dcmemory.o \
-       monodll_dcscreen.o \
-       monodll_dialog.o \
-       monodll_dirdlg.o \
-       monodll_display.o \
-       monodll_drawer.o \
-       monodll_evtloop.o \
-       monodll_filedlg.o \
-       monodll_font.o \
-       monodll_fontdlg.o \
-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_frame.o \
-       monodll_gauge.o \
-       monodll_icon.o \
-       monodll_listbox.o \
-       monodll_main.o \
+       monodll_cocoa_app.o \
+       monodll_cocoa_bitmap.o \
+       monodll_cocoa_bmpbuttn.o \
+       monodll_cocoa_brush.o \
+       monodll_src_cocoa_button.o \
+       monodll_src_cocoa_checkbox.o \
+       monodll_cocoa_checklst.o \
+       monodll_src_cocoa_choice.o \
+       monodll_cocoa_clipbrd.o \
+       monodll_cocoa_colordlg.o \
+       monodll_src_cocoa_colour.o \
+       monodll_src_cocoa_combobox.o \
+       monodll_cocoa_control.o \
+       monodll_cocoa_cursor.o \
+       monodll_cocoa_data.o \
+       monodll_cocoa_dataobj.o \
+       monodll_cocoa_dc.o \
+       monodll_cocoa_dcclient.o \
+       monodll_cocoa_dcmemory.o \
+       monodll_cocoa_dcscreen.o \
+       monodll_src_cocoa_dialog.o \
+       monodll_src_cocoa_dirdlg.o \
+       monodll_cocoa_display.o \
+       monodll_cocoa_drawer.o \
+       monodll_src_cocoa_evtloop.o \
+       monodll_src_cocoa_filedlg.o \
+       monodll_cocoa_font.o \
+       monodll_cocoa_fontdlg.o \
+       monodll_cocoa_fontenum.o \
+       monodll_cocoa_fontutil.o \
+       monodll_cocoa_frame.o \
+       monodll_src_cocoa_gauge.o \
+       monodll_cocoa_icon.o \
+       monodll_src_cocoa_listbox.o \
+       monodll_cocoa_main.o \
         monodll_mbarman.o \
         monodll_mbarman.o \
-       monodll_mdi.o \
-       monodll_menu.o \
-       monodll_menuitem.o \
-       monodll_msgdlg.o \
-       monodll_notebook.o \
-       monodll_pen.o \
-       monodll_radiobox.o \
-       monodll_radiobut.o \
-       monodll_region.o \
-       monodll_scrolbar.o \
-       monodll_settings.o \
-       monodll_slider.o \
-       monodll_sound.o \
-       monodll_spinbutt.o \
-       monodll_statbmp.o \
-       monodll_statbox.o \
+       monodll_cocoa_mdi.o \
+       monodll_src_cocoa_menu.o \
+       monodll_src_cocoa_menuitem.o \
+       monodll_src_cocoa_msgdlg.o \
+       monodll_src_cocoa_notebook.o \
+       monodll_cocoa_pen.o \
+       monodll_cocoa_radiobox.o \
+       monodll_src_cocoa_radiobut.o \
+       monodll_cocoa_region.o \
+       monodll_src_cocoa_scrolbar.o \
+       monodll_cocoa_settings.o \
+       monodll_src_cocoa_slider.o \
+       monodll_cocoa_sound.o \
+       monodll_src_cocoa_spinbutt.o \
+       monodll_cocoa_statbmp.o \
+       monodll_src_cocoa_statbox.o \
         monodll_statline2.o \
         monodll_statline2.o \
-       monodll_stattext.o \
-       monodll_textctrl.o \
-       monodll_timer.o \
-       monodll_toolbar.o \
-       monodll_tooltip.o \
-       monodll_toplevel.o \
-       monodll_utils.o \
-       monodll_utilsexc.o \
-       monodll_window.o \
-       monodll_accel.o \
-       monodll_caret.o \
+       monodll_src_cocoa_stattext.o \
+       monodll_src_cocoa_textctrl.o \
+       monodll_cocoa_timer.o \
+       monodll_src_cocoa_toolbar.o \
+       monodll_src_cocoa_tooltip.o \
+       monodll_cocoa_toplevel.o \
+       monodll_src_cocoa_utils.o \
+       monodll_cocoa_utilsexc.o \
+       monodll_src_cocoa_window.o \
+       monodll_generic_accel.o \
+       monodll_generic_caret.o \
         monodll_clrpickerg.o \
         monodll_collpaneg.o \
         monodll_colrdlgg.o \
         monodll_clrpickerg.o \
         monodll_collpaneg.o \
         monodll_colrdlgg.o \
-       monodll_fdrepdlg.o \
+       monodll_generic_fdrepdlg.o \
         monodll_filepickerg.o \
         monodll_fontdlgg.o \
         monodll_fontpickerg.o \
         monodll_filepickerg.o \
         monodll_fontdlgg.o \
         monodll_fontpickerg.o \
-       monodll_imaglist.o \
-       monodll_listctrl.o \
-       monodll_msgdlgg.o \
+       monodll_generic_imaglist.o \
+       monodll_generic_listctrl.o \
         monodll_paletteg.o \
         monodll_regiong.o \
         monodll_paletteg.o \
         monodll_regiong.o \
-       monodll_statusbr.o \
-       monodll_tabg.o
+       monodll_generic_statusbr.o
  @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS =  \
  @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS =  \
-       monodll_accel.o \
+       monodll_generic_accel.o \
         monodll_clrpickerg.o \
         monodll_collpaneg.o \
         monodll_colrdlgg.o \
         monodll_dirdlgg.o \
         monodll_clrpickerg.o \
         monodll_collpaneg.o \
         monodll_colrdlgg.o \
         monodll_dirdlgg.o \
-       monodll_fdrepdlg.o \
+       monodll_generic_fdrepdlg.o \
         monodll_filedlgg.o \
         monodll_filepickerg.o \
         monodll_fontdlgg.o \
         monodll_fontpickerg.o \
         monodll_filedlgg.o \
         monodll_filepickerg.o \
         monodll_fontdlgg.o \
         monodll_fontpickerg.o \
-       monodll_listctrl.o \
-       monodll_msgdlgg.o \
+       monodll_generic_listctrl.o \
         monodll_prntdlgg.o \
         monodll_prntdlgg.o \
-       monodll_statusbr.o \
-       monodll_tabg.o \
-       monodll_bmpbuttn.o \
-       monodll_button.o \
-       monodll_checkbox.o \
-       monodll_checklst.o \
-       monodll_choice.o \
-       monodll_combobox.o \
-       monodll_control.o \
-       monodll_dialog.o \
-       monodll_filedlg.o \
-       monodll_fontdlg.o \
-       monodll_frame.o \
-       monodll_gauge.o \
-       monodll_listbox.o \
-       monodll_mdi.o \
-       monodll_menu.o \
-       monodll_notebook.o \
-       monodll_radiobox.o \
-       monodll_radiobut.o \
-       monodll_scrolbar.o \
-       monodll_scrolwin.o \
-       monodll_slider.o \
-       monodll_spinbutt.o \
-       monodll_spinctrl.o \
-       monodll_statbmp.o \
-       monodll_statbox.o \
-       monodll_statline.o \
-       monodll_stattext.o \
-       monodll_tbargtk.o \
-       monodll_textctrl.o \
-       monodll_tglbtn.o
+       monodll_generic_statusbr.o \
+       monodll_gtk1_bmpbuttn.o \
+       monodll_gtk1_button.o \
+       monodll_gtk1_checkbox.o \
+       monodll_gtk1_checklst.o \
+       monodll_gtk1_choice.o \
+       monodll_gtk1_combobox.o \
+       monodll_gtk1_control.o \
+       monodll_gtk1_dialog.o \
+       monodll_gtk1_filedlg.o \
+       monodll_gtk1_fontdlg.o \
+       monodll_gtk1_frame.o \
+       monodll_gtk1_gauge.o \
+       monodll_gtk1_listbox.o \
+       monodll_gtk1_mdi.o \
+       monodll_gtk1_menu.o \
+       monodll_gtk1_mnemonics.o \
+       monodll_gtk1_notebook.o \
+       monodll_gtk1_radiobox.o \
+       monodll_gtk1_radiobut.o \
+       monodll_gtk1_scrolbar.o \
+       monodll_gtk1_scrolwin.o \
+       monodll_gtk1_slider.o \
+       monodll_gtk1_spinbutt.o \
+       monodll_gtk1_spinctrl.o \
+       monodll_gtk1_statbmp.o \
+       monodll_gtk1_statbox.o \
+       monodll_gtk1_statline.o \
+       monodll_gtk1_stattext.o \
+       monodll_gtk1_toolbar.o \
+       monodll_gtk1_textctrl.o \
+       monodll_gtk1_tglbtn.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS =  \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS =  \
-       monodll_accel.o \
-       monodll_fdrepdlg.o \
+       monodll_generic_accel.o \
+       monodll_generic_fdrepdlg.o \
         monodll_filepickerg.o \
         monodll_filepickerg.o \
-       monodll_graphicc.o \
-       monodll_listctrl.o \
+       monodll_generic_listctrl.o \
         monodll_prntdlgg.o \
         monodll_prntdlgg.o \
-       monodll_statusbr.o \
-       monodll_tabg.o \
+       monodll_generic_statusbr.o \
         monodll_fontdlgg.o \
         monodll_fontdlgg.o \
-       monodll_msgdlgg.o \
+       monodll_gtk_anybutton.o \
         monodll_artgtk.o \
         monodll_artgtk.o \
-       monodll_bmpbuttn.o \
-       monodll_button.o \
-       monodll_checkbox.o \
-       monodll_checklst.o \
-       monodll_choice.o \
+       monodll_gtk_bmpbuttn.o \
+       monodll_gtk_button.o \
+       monodll_gtk_checkbox.o \
+       monodll_gtk_checklst.o \
+       monodll_gtk_choice.o \
         monodll_collpane.o \
         monodll_collpane.o \
-       monodll_colordlg.o \
-       monodll_combobox.o \
-       monodll_control.o \
+       monodll_gtk_colordlg.o \
+       monodll_gtk_combobox.o \
+       monodll_gtk_control.o \
         monodll_clrpicker.o \
         monodll_clrpicker.o \
-       monodll_dialog.o \
+       monodll_gtk_dialog.o \
         monodll_fontpicker.o \
         monodll_filepicker.o \
         monodll_fontpicker.o \
         monodll_filepicker.o \
-       monodll_dirdlg.o \
-       monodll_filedlg.o \
-       monodll_fontdlg.o \
-       monodll_frame.o \
-       monodll_gauge.o \
+       monodll_gtk_dirdlg.o \
+       monodll_gtk_filedlg.o \
+       monodll_gtk_fontdlg.o \
+       monodll_gtk_frame.o \
+       monodll_gtk_gauge.o \
         monodll_gprint.o \
         monodll_gvfs.o \
         monodll_gprint.o \
         monodll_gvfs.o \
-       monodll_print.o \
-       monodll_listbox.o \
-       monodll_mdi.o \
-       monodll_menu.o \
-       monodll_mnemonics.o \
-       monodll_msgdlg.o \
-       monodll_nativewin.o \
-       monodll_notebook.o \
-       monodll_radiobox.o \
-       monodll_radiobut.o \
-       monodll_scrolbar.o \
-       monodll_scrolwin.o \
-       monodll_slider.o \
-       monodll_spinbutt.o \
-       monodll_spinctrl.o \
-       monodll_statbmp.o \
-       monodll_statbox.o \
-       monodll_statline.o \
-       monodll_stattext.o \
-       monodll_tbargtk.o \
-       monodll_textctrl.o \
-       monodll_textentry.o \
-       monodll_tglbtn.o \
+       monodll_gtk_infobar.o \
+       monodll_gtk_listbox.o \
+       monodll_gtk_mdi.o \
+       monodll_gtk_menu.o \
+       monodll_gtk_mnemonics.o \
+       monodll_gtk_msgdlg.o \
+       monodll_gtk_nativewin.o \
+       monodll_gtk_notebook.o \
+       monodll_gtk_print.o \
+       monodll_gtk_radiobox.o \
+       monodll_gtk_radiobut.o \
+       monodll_gtk_scrolbar.o \
+       monodll_gtk_scrolwin.o \
+       monodll_gtk_slider.o \
+       monodll_gtk_spinbutt.o \
+       monodll_gtk_spinctrl.o \
+       monodll_gtk_statbmp.o \
+       monodll_gtk_statbox.o \
+       monodll_gtk_statline.o \
+       monodll_gtk_stattext.o \
+       monodll_gtk_toolbar.o \
+       monodll_gtk_textctrl.o \
+       monodll_gtk_textentry.o \
+       monodll_gtk_tglbtn.o \
         monodll_treeentry_gtk.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS)
  COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS =  \
         monodll_treeentry_gtk.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS)
  COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS =  \
-       monodll_accel.o \
-       monodll_app.o \
-       monodll_bmpbuttn.o \
+       monodll_motif_accel.o \
+       monodll_motif_app.o \
+       monodll_motif_bmpbuttn.o \
         monodll_bmpmotif.o \
         monodll_bmpmotif.o \
-       monodll_button.o \
-       monodll_checkbox.o \
-       monodll_checklst.o \
-       monodll_choice.o \
-       monodll_clipbrd.o \
-       monodll_colour.o \
-       monodll_combobox.o \
+       monodll_motif_button.o \
+       monodll_motif_checkbox.o \
+       monodll_motif_checklst.o \
+       monodll_motif_choice.o \
+       monodll_motif_clipbrd.o \
+       monodll_motif_colour.o \
+       monodll_motif_combobox.o \
         monodll_combobox_native.o \
         monodll_combobox_native.o \
-       monodll_control.o \
-       monodll_cursor.o \
-       monodll_data.o \
-       monodll_dataobj.o \
-       monodll_dc.o \
-       monodll_dcclient.o \
-       monodll_dcmemory.o \
-       monodll_dcscreen.o \
-       monodll_dialog.o \
-       monodll_evtloop.o \
-       monodll_filedlg.o \
-       monodll_font.o \
-       monodll_frame.o \
-       monodll_gauge.o \
-       monodll_gsockmot.o \
-       monodll_icon.o \
-       monodll_listbox.o \
-       monodll_main.o \
-       monodll_mdi.o \
-       monodll_menu.o \
-       monodll_menuitem.o \
-       monodll_minifram.o \
-       monodll_msgdlg.o \
-       monodll_popupwin.o \
-       monodll_radiobox.o \
-       monodll_radiobut.o \
-       monodll_scrolbar.o \
-       monodll_settings.o \
-       monodll_slider.o \
-       monodll_spinbutt.o \
-       monodll_statbmp.o \
-       monodll_statbox.o \
-       monodll_stattext.o \
-       monodll_textctrl.o \
-       monodll_textentry.o \
-       monodll_timer.o \
-       monodll_toolbar.o \
-       monodll_toplevel.o \
-       monodll_utils.o \
-       monodll_window.o \
+       monodll_motif_control.o \
+       monodll_motif_cursor.o \
+       monodll_motif_data.o \
+       monodll_motif_dataobj.o \
+       monodll_motif_dc.o \
+       monodll_motif_dcclient.o \
+       monodll_motif_dcmemory.o \
+       monodll_motif_dcscreen.o \
+       monodll_motif_dialog.o \
+       monodll_motif_evtloop.o \
+       monodll_motif_filedlg.o \
+       monodll_motif_font.o \
+       monodll_motif_frame.o \
+       monodll_motif_gauge.o \
+       monodll_sockmot.o \
+       monodll_motif_icon.o \
+       monodll_motif_listbox.o \
+       monodll_motif_main.o \
+       monodll_motif_menu.o \
+       monodll_motif_menuitem.o \
+       monodll_motif_minifram.o \
+       monodll_motif_msgdlg.o \
+       monodll_motif_popupwin.o \
+       monodll_motif_radiobox.o \
+       monodll_motif_radiobut.o \
+       monodll_motif_scrolbar.o \
+       monodll_motif_settings.o \
+       monodll_motif_slider.o \
+       monodll_motif_spinbutt.o \
+       monodll_motif_statbmp.o \
+       monodll_motif_statbox.o \
+       monodll_motif_stattext.o \
+       monodll_motif_textctrl.o \
+       monodll_motif_textentry.o \
+       monodll_motif_timer.o \
+       monodll_motif_toolbar.o \
+       monodll_motif_toplevel.o \
+       monodll_motif_utils.o \
+       monodll_motif_window.o \
         monodll_xmcombo.o \
         monodll_clrpickerg.o \
         monodll_collpaneg.o \
         monodll_colrdlgg.o \
         monodll_dirdlgg.o \
         monodll_xmcombo.o \
         monodll_clrpickerg.o \
         monodll_collpaneg.o \
         monodll_colrdlgg.o \
         monodll_dirdlgg.o \
-       monodll_fdrepdlg.o \
+       monodll_generic_fdrepdlg.o \
         monodll_filepickerg.o \
         monodll_fontdlgg.o \
         monodll_fontpickerg.o \
         monodll_filepickerg.o \
         monodll_fontdlgg.o \
         monodll_fontpickerg.o \
-       monodll_listctrl.o \
-       monodll_notebook.o \
+       monodll_generic_listctrl.o \
+       monodll_mdig.o \
+       monodll_generic_notebook.o \
         monodll_prntdlgg.o \
         monodll_prntdlgg.o \
-       monodll_statline.o \
-       monodll_statusbr.o \
+       monodll_generic_statline.o \
+       monodll_generic_statusbr.o \
         monodll_tabg.o
  @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS)
  COND_TOOLKIT_MSW___GUI_SRC_OBJECTS =  \
         monodll_tabg.o
  @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS)
  COND_TOOLKIT_MSW___GUI_SRC_OBJECTS =  \
@@ -4874,291 +5498,302 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS =  \
         monodll_collpaneg.o \
         monodll_filepickerg.o \
         monodll_fontpickerg.o \
         monodll_collpaneg.o \
         monodll_filepickerg.o \
         monodll_fontpickerg.o \
-       monodll_statusbr.o \
+       monodll_generic_statusbr.o \
         monodll_prntdlgg.o \
         monodll_prntdlgg.o \
-       monodll_accel.o \
-       monodll_bmpbuttn.o \
-       monodll_button.o \
-       monodll_checkbox.o \
-       monodll_choice.o \
-       monodll_colordlg.o \
+       monodll_msw_accel.o \
+       monodll_msw_anybutton.o \
+       monodll_artmsw.o \
+       monodll_msw_bmpbuttn.o \
+       monodll_msw_button.o \
+       monodll_msw_checkbox.o \
+       monodll_msw_choice.o \
+       monodll_msw_colordlg.o \
         monodll_combo.o \
         monodll_combo.o \
-       monodll_combobox.o \
-       monodll_control.o \
-       monodll_dialog.o \
-       monodll_dirdlg.o \
+       monodll_msw_combobox.o \
+       monodll_msw_control.o \
+       monodll_msw_dialog.o \
+       monodll_msw_dirdlg.o \
         monodll_dragimag.o \
         monodll_dragimag.o \
-       monodll_filedlg.o \
-       monodll_frame.o \
-       monodll_gauge.o \
-       monodll_iniconf.o \
-       monodll_listbox.o \
-       monodll_listctrl.o \
-       monodll_mdi.o \
-       monodll_menu.o \
-       monodll_menuitem.o \
-       monodll_metafile.o \
-       monodll_msgdlg.o \
-       monodll_nativdlg.o \
-       monodll_nativewin.o \
-       monodll_notebook.o \
+       monodll_msw_filedlg.o \
+       monodll_msw_frame.o \
+       monodll_msw_gauge.o \
+       monodll_headerctrl.o \
+       monodll_msw_iniconf.o \
+       monodll_msw_listbox.o \
+       monodll_msw_listctrl.o \
+       monodll_msw_mdi.o \
+       monodll_msw_menu.o \
+       monodll_msw_menuitem.o \
+       monodll_msw_metafile.o \
+       monodll_msw_msgdlg.o \
+       monodll_msw_nativdlg.o \
+       monodll_msw_nativewin.o \
+       monodll_msw_notebook.o \
         monodll_access.o \
         monodll_access.o \
-       monodll_ownerdrw.o \
-       monodll_radiobox.o \
-       monodll_radiobut.o \
-       monodll_scrolbar.o \
-       monodll_slider.o \
-       monodll_spinbutt.o \
-       monodll_spinctrl.o \
-       monodll_statbmp.o \
-       monodll_statbox.o \
+       monodll_msw_ownerdrw.o \
+       monodll_msw_panel.o \
+       monodll_progdlg.o \
+       monodll_msw_radiobox.o \
+       monodll_msw_radiobut.o \
+       monodll_richmsgdlg.o \
+       monodll_msw_scrolbar.o \
+       monodll_msw_slider.o \
+       monodll_msw_spinbutt.o \
+       monodll_msw_spinctrl.o \
+       monodll_msw_statbmp.o \
+       monodll_msw_statbox.o \
         monodll_statusbar.o \
         monodll_statusbar.o \
-       monodll_statline.o \
-       monodll_stattext.o \
-       monodll_tabctrl.o \
-       monodll_toolbar.o \
-       monodll_textctrl.o \
-       monodll_textentry.o \
-       monodll_tglbtn.o \
+       monodll_msw_statline.o \
+       monodll_msw_stattext.o \
+       monodll_msw_toolbar.o \
+       monodll_msw_textctrl.o \
+       monodll_msw_textentry.o \
+       monodll_msw_tglbtn.o \
         monodll_treectrl.o \
         monodll_treectrl.o \
-       monodll_checklst.o \
-       monodll_fdrepdlg.o \
-       monodll_fontdlg.o
+       monodll_msw_checklst.o \
+       monodll_msw_fdrepdlg.o \
+       monodll_msw_fontdlg.o
  @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS)
  COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS =  \
         $(__OSX_CARBON_COCOA_SRC_OBJECTS) \
  @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS)
  COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS =  \
         $(__OSX_CARBON_COCOA_SRC_OBJECTS) \
-       monodll_bmpbuttn.o \
-       monodll_button.o \
-       monodll_checkbox.o \
-       monodll_choice.o \
-       monodll_colordlg.o \
-       monodll_dialog.o \
-       monodll_dirdlg.o \
-       monodll_evtloop.o \
-       monodll_filedlg.o \
-       monodll_gauge.o \
-       monodll_listbox.o \
+       monodll_carbon_anybutton.o \
+       monodll_carbon_bmpbuttn.o \
+       monodll_carbon_button.o \
+       monodll_carbon_checkbox.o \
+       monodll_carbon_choice.o \
+       monodll_carbon_colordlg.o \
+       monodll_carbon_dialog.o \
+       monodll_carbon_dirdlg.o \
+       monodll_carbon_dnd.o \
+       monodll_carbon_evtloop.o \
+       monodll_carbon_filedlg.o \
+       monodll_carbon_gauge.o \
+       monodll_carbon_listbox.o \
         monodll_listctrl_mac.o \
         monodll_listctrl_mac.o \
-       monodll_mdi.o \
-       monodll_menu.o \
-       monodll_menuitem.o \
-       monodll_msgdlg.o \
-       monodll_nonownedwnd.o \
+       monodll_carbon_menu.o \
+       monodll_carbon_menuitem.o \
+       monodll_carbon_msgdlg.o \
+       monodll_carbon_nonownedwnd.o \
         monodll_notebmac.o \
         monodll_notebmac.o \
-       monodll_radiobut.o \
-       monodll_region.o \
-       monodll_scrolbar.o \
-       monodll_slider.o \
-       monodll_spinbutt.o \
-       monodll_srchctrl.o \
-       monodll_statbmp.o \
-       monodll_statbox.o \
+       monodll_carbon_printdlg.o \
+       monodll_carbon_radiobut.o \
+       monodll_carbon_scrolbar.o \
+       monodll_carbon_slider.o \
+       monodll_carbon_spinbutt.o \
+       monodll_carbon_srchctrl.o \
+       monodll_carbon_statbmp.o \
+       monodll_carbon_statbox.o \
         monodll_statlmac.o \
         monodll_statlmac.o \
-       monodll_stattext.o \
-       monodll_textctrl.o \
-       monodll_tglbtn.o \
-       monodll_toolbar.o \
-       monodll_window.o \
-       monodll_webkit.o \
-       monodll_caret.o \
-       monodll_clrpickerg.o \
-       monodll_collpaneg.o \
-       monodll_fdrepdlg.o \
-       monodll_filepickerg.o \
-       monodll_fontdlgg.o \
-       monodll_fontpickerg.o \
-       monodll_listctrl.o \
-       monodll_prntdlgg.o \
-       monodll_statusbr.o \
-       monodll_tabg.o
+       monodll_carbon_stattext.o \
+       monodll_carbon_textctrl.o \
+       monodll_carbon_tglbtn.o \
+       monodll_carbon_toolbar.o \
+       monodll_carbon_tooltip.o \
+       monodll_carbon_window.o
  @COND_TOOLKIT_OSX_CARBON@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS)
  COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS =  \
         $(__OSX_CARBON_COCOA_SRC_OBJECTS) \
  @COND_TOOLKIT_OSX_CARBON@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS)
  COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS =  \
         $(__OSX_CARBON_COCOA_SRC_OBJECTS) \
-       monodll_bmpbuttn.o \
-       monodll_button.o \
-       monodll_checkbox.o \
-       monodll_choice.o \
-       monodll_dialog.o \
-       monodll_dirdlg.o \
-       monodll_evtloop.o \
-       monodll_filedlg.o \
-       monodll_gauge.o \
-       monodll_glcanvas.o \
-       monodll_listbox.o \
-       monodll_menu.o \
-       monodll_menuitem.o \
-       monodll_msgdlg.o \
-       monodll_nonownedwnd.o \
-       monodll_notebook.o \
-       monodll_radiobut.o \
-       monodll_scrolbar.o \
-       monodll_slider.o \
-       monodll_spinbutt.o \
-       monodll_srchctrl.o \
-       monodll_statbox.o \
-       monodll_statline.o \
-       monodll_stattext.o \
-       monodll_textctrl.o \
-       monodll_tglbtn.o \
-       monodll_toolbar.o \
-       monodll_window.o \
-       monodll_caret.o \
-       monodll_clrpickerg.o \
-       monodll_collpaneg.o \
-       monodll_fdrepdlg.o \
-       monodll_filepickerg.o \
-       monodll_fontdlgg.o \
-       monodll_fontpickerg.o \
-       monodll_listctrl.o \
-       monodll_prntdlgg.o \
-       monodll_regiong.o \
-       monodll_statusbr.o \
-       monodll_tabg.o
+       monodll_cocoa_anybutton.o \
+       monodll_osx_cocoa_button.o \
+       monodll_osx_cocoa_checkbox.o \
+       monodll_osx_cocoa_choice.o \
+       monodll_osx_cocoa_colour.o \
+       monodll_osx_cocoa_combobox.o \
+       monodll_osx_cocoa_dialog.o \
+       monodll_osx_cocoa_dirdlg.o \
+       monodll_cocoa_dnd.o \
+       monodll_osx_cocoa_evtloop.o \
+       monodll_osx_cocoa_filedlg.o \
+       monodll_osx_cocoa_gauge.o \
+       monodll_osx_cocoa_listbox.o \
+       monodll_osx_cocoa_menu.o \
+       monodll_osx_cocoa_menuitem.o \
+       monodll_osx_cocoa_msgdlg.o \
+       monodll_cocoa_nonownedwnd.o \
+       monodll_osx_cocoa_notebook.o \
+       monodll_osx_cocoa_radiobut.o \
+       monodll_cocoa_printdlg.o \
+       monodll_osx_cocoa_scrolbar.o \
+       monodll_osx_cocoa_slider.o \
+       monodll_osx_cocoa_spinbutt.o \
+       monodll_cocoa_srchctrl.o \
+       monodll_osx_cocoa_statbox.o \
+       monodll_cocoa_statline.o \
+       monodll_osx_cocoa_stattext.o \
+       monodll_osx_cocoa_textctrl.o \
+       monodll_cocoa_tglbtn.o \
+       monodll_osx_cocoa_toolbar.o \
+       monodll_osx_cocoa_tooltip.o \
+       monodll_osx_cocoa_window.o
  @COND_TOOLKIT_OSX_COCOA@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS)
  @COND_TOOLKIT_OSX_COCOA@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS)
+COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS =  \
+       $(__OSX_CARBON_COCOA_SRC_OBJECTS) \
+       monodll_regiong.o \
+       monodll_generic_icon.o \
+       monodll_iphone_anybutton.o \
+       monodll_iphone_button.o \
+       monodll_iphone_checkbox.o \
+       monodll_iphone_dialog.o \
+       monodll_iphone_evtloop.o \
+       monodll_iphone_gauge.o \
+       monodll_iphone_msgdlg.o \
+       monodll_iphone_nonownedwnd.o \
+       monodll_iphone_scrolbar.o \
+       monodll_iphone_slider.o \
+       monodll_iphone_stattext.o \
+       monodll_iphone_textctrl.o \
+       monodll_iphone_toolbar.o \
+       monodll_iphone_utils.o \
+       monodll_iphone_window.o
+@COND_TOOLKIT_OSX_IPHONE@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS)
  COND_TOOLKIT_PM___GUI_SRC_OBJECTS =  \
  COND_TOOLKIT_PM___GUI_SRC_OBJECTS =  \
-       monodll_caret.o \
+       monodll_generic_caret.o \
         monodll_clrpickerg.o \
         monodll_collpaneg.o \
         monodll_colrdlgg.o \
         monodll_dirdlgg.o \
         monodll_clrpickerg.o \
         monodll_collpaneg.o \
         monodll_colrdlgg.o \
         monodll_dirdlgg.o \
-       monodll_fdrepdlg.o \
+       monodll_generic_fdrepdlg.o \
         monodll_filepickerg.o \
         monodll_fontpickerg.o \
         monodll_filepickerg.o \
         monodll_fontpickerg.o \
-       monodll_imaglist.o \
-       monodll_listctrl.o \
+       monodll_generic_imaglist.o \
+       monodll_generic_listctrl.o \
         monodll_mdig.o \
         monodll_prntdlgg.o \
         monodll_mdig.o \
         monodll_prntdlgg.o \
-       monodll_statusbr.o \
-       monodll_accel.o \
-       monodll_app.o \
-       monodll_bitmap.o \
-       monodll_bmpbuttn.o \
-       monodll_brush.o \
-       monodll_button.o \
-       monodll_checkbox.o \
-       monodll_checklst.o \
-       monodll_choice.o \
-       monodll_clipbrd.o \
-       monodll_colour.o \
-       monodll_combobox.o \
-       monodll_control.o \
-       monodll_cursor.o \
-       monodll_data.o \
-       monodll_dataobj.o \
-       monodll_dc.o \
-       monodll_dcclient.o \
-       monodll_dcmemory.o \
-       monodll_dcprint.o \
-       monodll_dcscreen.o \
-       monodll_dialog.o \
-       monodll_dnd.o \
-       monodll_evtloop.o \
-       monodll_filedlg.o \
-       monodll_font.o \
-       monodll_fontdlg.o \
-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_frame.o \
-       monodll_gauge.o \
-       monodll_gdiimage.o \
-       monodll_gsockpm.o \
-       monodll_helpwin.o \
-       monodll_icon.o \
-       monodll_iniconf.o \
-       monodll_listbox.o \
-       monodll_main.o \
-       monodll_menu.o \
-       monodll_menuitem.o \
-       monodll_metafile.o \
-       monodll_minifram.o \
-       monodll_msgdlg.o \
-       monodll_nativdlg.o \
-       monodll_notebook.o \
-       monodll_ownerdrw.o \
-       monodll_palette.o \
-       monodll_pen.o \
-       monodll_popupwin.o \
-       monodll_print.o \
-       monodll_radiobox.o \
-       monodll_radiobut.o \
-       monodll_region.o \
-       monodll_scrolbar.o \
-       monodll_settings.o \
-       monodll_slider.o \
-       monodll_spinbutt.o \
-       monodll_spinctrl.o \
-       monodll_statbmp.o \
-       monodll_statbox.o \
-       monodll_statline.o \
-       monodll_stattext.o \
-       monodll_tabctrl.o \
-       monodll_textctrl.o \
-       monodll_textentry.o \
-       monodll_tglbtn.o \
-       monodll_timer.o \
-       monodll_toolbar.o \
-       monodll_tooltip.o \
-       monodll_toplevel.o \
-       monodll_utilsgui.o \
-       monodll_window.o
+       monodll_generic_statusbr.o \
+       monodll_os2_accel.o \
+       monodll_os2_app.o \
+       monodll_os2_bitmap.o \
+       monodll_os2_bmpbuttn.o \
+       monodll_os2_brush.o \
+       monodll_os2_button.o \
+       monodll_os2_checkbox.o \
+       monodll_os2_checklst.o \
+       monodll_os2_choice.o \
+       monodll_os2_clipbrd.o \
+       monodll_os2_colour.o \
+       monodll_os2_combobox.o \
+       monodll_os2_control.o \
+       monodll_os2_cursor.o \
+       monodll_os2_data.o \
+       monodll_os2_dataobj.o \
+       monodll_os2_dc.o \
+       monodll_os2_dcclient.o \
+       monodll_os2_dcmemory.o \
+       monodll_os2_dcprint.o \
+       monodll_os2_dcscreen.o \
+       monodll_os2_dialog.o \
+       monodll_os2_dnd.o \
+       monodll_os2_evtloop.o \
+       monodll_os2_filedlg.o \
+       monodll_os2_font.o \
+       monodll_os2_fontdlg.o \
+       monodll_os2_fontenum.o \
+       monodll_os2_fontutil.o \
+       monodll_os2_frame.o \
+       monodll_os2_gauge.o \
+       monodll_os2_gdiimage.o \
+       monodll_sockpm.o \
+       monodll_os2_helpwin.o \
+       monodll_os2_icon.o \
+       monodll_os2_iniconf.o \
+       monodll_os2_listbox.o \
+       monodll_os2_main.o \
+       monodll_os2_menu.o \
+       monodll_os2_menuitem.o \
+       monodll_os2_metafile.o \
+       monodll_os2_minifram.o \
+       monodll_os2_msgdlg.o \
+       monodll_os2_nativdlg.o \
+       monodll_os2_notebook.o \
+       monodll_os2_ownerdrw.o \
+       monodll_os2_palette.o \
+       monodll_os2_pen.o \
+       monodll_os2_popupwin.o \
+       monodll_os2_print.o \
+       monodll_os2_radiobox.o \
+       monodll_os2_radiobut.o \
+       monodll_os2_region.o \
+       monodll_os2_scrolbar.o \
+       monodll_os2_settings.o \
+       monodll_os2_slider.o \
+       monodll_os2_spinbutt.o \
+       monodll_os2_spinctrl.o \
+       monodll_os2_statbmp.o \
+       monodll_os2_statbox.o \
+       monodll_os2_statline.o \
+       monodll_os2_stattext.o \
+       monodll_os2_textctrl.o \
+       monodll_os2_textentry.o \
+       monodll_os2_tglbtn.o \
+       monodll_os2_timer.o \
+       monodll_os2_toolbar.o \
+       monodll_os2_tooltip.o \
+       monodll_os2_toplevel.o \
+       monodll_os2_utilsgui.o \
+       monodll_os2_window.o
  @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS)
  COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS =  \
         monodll_clrpickerg.o \
         monodll_collpaneg.o \
         monodll_filepickerg.o \
         monodll_fontpickerg.o \
  @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS)
  COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS =  \
         monodll_clrpickerg.o \
         monodll_collpaneg.o \
         monodll_filepickerg.o \
         monodll_fontpickerg.o \
-       monodll_statusbr.o \
+       monodll_generic_statusbr.o \
         monodll_prntdlgg.o \
         monodll_prntdlgg.o \
-       monodll_accel.o \
-       monodll_bmpbuttn.o \
-       monodll_button.o \
-       monodll_checkbox.o \
-       monodll_choice.o \
-       monodll_colordlg.o \
+       monodll_msw_accel.o \
+       monodll_msw_anybutton.o \
+       monodll_artmsw.o \
+       monodll_msw_bmpbuttn.o \
+       monodll_msw_button.o \
+       monodll_msw_checkbox.o \
+       monodll_msw_choice.o \
+       monodll_msw_colordlg.o \
         monodll_combo.o \
         monodll_combo.o \
-       monodll_combobox.o \
-       monodll_control.o \
-       monodll_dialog.o \
-       monodll_dirdlg.o \
+       monodll_msw_combobox.o \
+       monodll_msw_control.o \
+       monodll_msw_dialog.o \
+       monodll_msw_dirdlg.o \
         monodll_dragimag.o \
         monodll_dragimag.o \
-       monodll_filedlg.o \
-       monodll_frame.o \
-       monodll_gauge.o \
-       monodll_iniconf.o \
-       monodll_listbox.o \
-       monodll_listctrl.o \
-       monodll_mdi.o \
-       monodll_menu.o \
-       monodll_menuitem.o \
-       monodll_metafile.o \
-       monodll_msgdlg.o \
-       monodll_nativdlg.o \
-       monodll_nativewin.o \
-       monodll_notebook.o \
+       monodll_msw_filedlg.o \
+       monodll_msw_frame.o \
+       monodll_msw_gauge.o \
+       monodll_headerctrl.o \
+       monodll_msw_iniconf.o \
+       monodll_msw_listbox.o \
+       monodll_msw_listctrl.o \
+       monodll_msw_mdi.o \
+       monodll_msw_menu.o \
+       monodll_msw_menuitem.o \
+       monodll_msw_metafile.o \
+       monodll_msw_msgdlg.o \
+       monodll_msw_nativdlg.o \
+       monodll_msw_nativewin.o \
+       monodll_msw_notebook.o \
         monodll_access.o \
         monodll_access.o \
-       monodll_ownerdrw.o \
-       monodll_radiobox.o \
-       monodll_radiobut.o \
-       monodll_scrolbar.o \
-       monodll_slider.o \
-       monodll_spinbutt.o \
-       monodll_spinctrl.o \
-       monodll_statbmp.o \
-       monodll_statbox.o \
+       monodll_msw_ownerdrw.o \
+       monodll_msw_panel.o \
+       monodll_progdlg.o \
+       monodll_msw_radiobox.o \
+       monodll_msw_radiobut.o \
+       monodll_richmsgdlg.o \
+       monodll_msw_scrolbar.o \
+       monodll_msw_slider.o \
+       monodll_msw_spinbutt.o \
+       monodll_msw_spinctrl.o \
+       monodll_msw_statbmp.o \
+       monodll_msw_statbox.o \
         monodll_statusbar.o \
         monodll_statusbar.o \
-       monodll_statline.o \
-       monodll_stattext.o \
-       monodll_tabctrl.o \
-       monodll_toolbar.o \
-       monodll_textctrl.o \
-       monodll_textentry.o \
-       monodll_tglbtn.o \
+       monodll_msw_statline.o \
+       monodll_msw_stattext.o \
+       monodll_msw_toolbar.o \
+       monodll_msw_textctrl.o \
+       monodll_msw_textentry.o \
+       monodll_msw_tglbtn.o \
         monodll_treectrl.o \
         monodll_dirdlgg.o \
         monodll_treectrl.o \
         monodll_dirdlgg.o \
-       monodll_fdrepdlg.o \
+       monodll_generic_fdrepdlg.o \
         monodll_filedlgg.o \
         monodll_fontdlgg.o \
         monodll_filedlgg.o \
         monodll_fontdlgg.o \
-       monodll_checklst.o \
+       monodll_wince_checklst.o \
         monodll_choicece.o \
         monodll_crt.o \
         monodll_filedlgwce.o \
         monodll_choicece.o \
         monodll_crt.o \
         monodll_filedlgwce.o \
@@ -5172,209 +5807,214 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS =  \
  @COND_TOOLKIT_COCOA@   monodll_hid.o monodll_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1 =  \
         monodll_fontmgrcmn.o \
  @COND_TOOLKIT_COCOA@   monodll_hid.o monodll_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1 =  \
         monodll_fontmgrcmn.o \
-       monodll_caret.o \
-       monodll_colour.o \
-       monodll_icon.o \
-       monodll_imaglist.o \
+       monodll_generic_caret.o \
+       monodll_generic_colour.o \
+       monodll_generic_icon.o \
+       monodll_generic_imaglist.o \
         monodll_mask.o \
         monodll_mask.o \
-       monodll_timer.o \
-       monodll_app.o \
-       monodll_bitmap.o \
-       monodll_brush.o \
-       monodll_cursor.o \
-       monodll_dc.o \
-       monodll_dcclient.o \
-       monodll_dcmemory.o \
-       monodll_dcscreen.o \
-       monodll_evtloop.o \
-       monodll_font.o \
-       monodll_fontenum.o \
-       monodll_fontmgr.o \
-       monodll_nonownedwnd.o \
-       monodll_overlay.o \
-       monodll_pen.o \
-       monodll_region.o \
-       monodll_settings.o \
-       monodll_toplevel.o \
-       monodll_utils.o \
-       monodll_window.o \
+       monodll_dfb_app.o \
+       monodll_dfb_bitmap.o \
+       monodll_dfb_brush.o \
+       monodll_dfb_cursor.o \
+       monodll_dfb_dc.o \
+       monodll_dfb_dcclient.o \
+       monodll_dfb_dcmemory.o \
+       monodll_dfb_dcscreen.o \
+       monodll_dfb_evtloop.o \
+       monodll_dfb_font.o \
+       monodll_dfb_fontenum.o \
+       monodll_dfb_fontmgr.o \
+       monodll_dfb_nonownedwnd.o \
+       monodll_dfb_overlay.o \
+       monodll_dfb_pen.o \
+       monodll_dfb_region.o \
+       monodll_dfb_settings.o \
+       monodll_dfb_toplevel.o \
+       monodll_dfb_utils.o \
+       monodll_dfb_window.o \
         monodll_wrapdfb.o
  @COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_1 =  \
         monodll_wrapdfb.o
  @COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_1 =  \
-       monodll_caret.o \
-       monodll_imaglist.o \
-       monodll_dialup.o \
-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_utilsx11.o \
+       monodll_generic_caret.o \
+       monodll_generic_imaglist.o \
+       monodll_unix_dialup.o \
         monodll_displayx11.o \
         monodll_displayx11.o \
-       monodll_icon.o \
+       monodll_unix_fontenum.o \
+       monodll_unix_fontutil.o \
+       monodll_uiactionx11.o \
+       monodll_utilsx11.o \
+       monodll_generic_icon.o \
         monodll_paletteg.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_gsockgtk.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
+       monodll_gtk1_app.o \
+       monodll_gtk1_bitmap.o \
+       monodll_gtk1_brush.o \
+       monodll_gtk1_clipbrd.o \
+       monodll_gtk1_colour.o \
+       monodll_gtk1_cursor.o \
+       monodll_gtk1_data.o \
+       monodll_gtk1_dataobj.o \
+       monodll_gtk1_dc.o \
+       monodll_gtk1_dcclient.o \
+       monodll_gtk1_dcmemory.o \
+       monodll_gtk1_dcscreen.o \
+       monodll_gtk1_dnd.o \
+       monodll_gtk1_evtloop.o \
+       monodll_gtk1_font.o \
+       monodll_gtk1_sockgtk.o \
+       monodll_gtk1_main.o \
+       monodll_gtk1_minifram.o \
+       monodll_gtk1_pen.o \
+       monodll_gtk1_popupwin.o \
+       monodll_gtk1_region.o \
+       monodll_gtk1_renderer.o \
+       monodll_gtk1_settings.o \
+       monodll_gtk1_timer.o \
+       monodll_gtk1_tooltip.o \
+       monodll_gtk1_toplevel.o \
+       monodll_gtk1_utilsgtk.o \
+       monodll_gtk1_win_gtk.o \
+       monodll_gtk1_window.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_1)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1 =  \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_1)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1 =  \
-       monodll_caret.o \
-       monodll_imaglist.o \
-       monodll_dialup.o \
-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_utilsx11.o \
+       monodll_generic_caret.o \
+       monodll_generic_imaglist.o \
+       monodll_unix_dialup.o \
         monodll_displayx11.o \
         monodll_displayx11.o \
-       monodll_icon.o \
+       monodll_unix_fontenum.o \
+       monodll_unix_fontutil.o \
+       monodll_uiactionx11.o \
+       monodll_utilsx11.o \
+       monodll_generic_icon.o \
         monodll_paletteg.o \
         monodll_paletteg.o \
-       monodll_app.o \
+       monodll_gtk_app.o \
         monodll_assertdlg_gtk.o \
         monodll_assertdlg_gtk.o \
-       monodll_bitmap.o \
-       monodll_brush.o \
-       monodll_clipbrd.o \
-       monodll_colour.o \
-       monodll_cursor.o \
-       monodll_dataobj.o \
-       monodll_dc.o \
-       monodll_dcclient.o \
-       monodll_dcmemory.o \
-       monodll_dcscreen.o \
-       monodll_dnd.o \
-       monodll_evtloop.o \
+       monodll_gtk_bitmap.o \
+       monodll_gtk_brush.o \
+       monodll_gtk_clipbrd.o \
+       monodll_gtk_colour.o \
+       monodll_gtk_cursor.o \
+       monodll_gtk_dataobj.o \
+       monodll_gtk_dc.o \
+       monodll_gtk_dcclient.o \
+       monodll_gtk_dcmemory.o \
+       monodll_gtk_dcscreen.o \
+       monodll_gtk_dnd.o \
+       monodll_gtk_evtloop.o \
         monodll_filectrl.o \
         monodll_filectrl.o \
-       monodll_font.o \
-       monodll_gsockgtk.o \
-       monodll_minifram.o \
-       monodll_pen.o \
-       monodll_popupwin.o \
+       monodll_filehistory.o \
+       monodll_gtk_font.o \
+       monodll_gtk_sockgtk.o \
+       monodll_gtk_minifram.o \
+       monodll_gtk_pen.o \
+       monodll_gtk_popupwin.o \
         monodll_private.o \
         monodll_private.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
+       monodll_gtk_region.o \
+       monodll_gtk_renderer.o \
+       monodll_gtk_settings.o \
+       monodll_gtk_timer.o \
+       monodll_gtk_tooltip.o \
+       monodll_gtk_toplevel.o \
+       monodll_gtk_utilsgtk.o \
+       monodll_gtk_win_gtk.o \
+       monodll_gtk_window.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_1 =  \
         monodll_fontmgrcmn.o \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_1 =  \
         monodll_fontmgrcmn.o \
-       monodll_caret.o \
-       monodll_colour.o \
-       monodll_icon.o \
-       monodll_imaglist.o \
+       monodll_generic_caret.o \
+       monodll_generic_colour.o \
+       monodll_generic_icon.o \
+       monodll_generic_imaglist.o \
         monodll_mask.o \
         monodll_mask.o \
-       monodll_timer.o \
-       monodll_app.o \
-       monodll_bitmap.o \
-       monodll_brush.o \
-       monodll_clipbrd.o \
-       monodll_cursor.o \
-       monodll_data.o \
-       monodll_dc.o \
-       monodll_dcclient.o \
-       monodll_dcmemory.o \
-       monodll_dcscreen.o \
+       monodll_generic_timer.o \
+       monodll_mgl_app.o \
+       monodll_mgl_bitmap.o \
+       monodll_mgl_brush.o \
+       monodll_mgl_clipbrd.o \
+       monodll_mgl_cursor.o \
+       monodll_mgl_data.o \
+       monodll_mgl_dc.o \
+       monodll_mgl_dcclient.o \
+       monodll_mgl_dcmemory.o \
+       monodll_mgl_dcscreen.o \
         monodll_dirmgl.o \
         monodll_dirmgl.o \
-       monodll_evtloop.o \
-       monodll_font.o \
-       monodll_fontenum.o \
-       monodll_fontmgr.o \
-       monodll_fontutil.o \
-       monodll_palette.o \
-       monodll_pen.o \
-       monodll_region.o \
-       monodll_settings.o \
-       monodll_toplevel.o \
-       monodll_utils.o \
-       monodll_window.o
+       monodll_mgl_evtloop.o \
+       monodll_mgl_font.o \
+       monodll_mgl_fontenum.o \
+       monodll_mgl_fontmgr.o \
+       monodll_mgl_fontutil.o \
+       monodll_mgl_palette.o \
+       monodll_mgl_pen.o \
+       monodll_mgl_region.o \
+       monodll_mgl_settings.o \
+       monodll_mgl_toplevel.o \
+       monodll_mgl_utils.o \
+       monodll_mgl_window.o
  @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_1)
  COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_1 =  \
  @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_imaglist.o \
-       monodll_dialup.o \
-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_utilsx11.o \
+       monodll_generic_caret.o \
+       monodll_generic_imaglist.o \
+       monodll_unix_dialup.o \
         monodll_displayx11.o \
         monodll_displayx11.o \
-       monodll_bitmap.o \
-       monodll_brush.o \
-       monodll_palette.o \
-       monodll_pen.o \
-       monodll_region.o \
+       monodll_unix_fontenum.o \
+       monodll_unix_fontutil.o \
+       monodll_uiactionx11.o \
+       monodll_utilsx11.o \
+       monodll_x11_bitmap.o \
+       monodll_x11_brush.o \
+       monodll_x11_palette.o \
+       monodll_x11_pen.o \
+       monodll_x11_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_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_activex.o \
+       monodll_msw_app.o \
+       monodll_msw_bitmap.o \
+       monodll_msw_brush.o \
+       monodll_msw_caret.o \
+       monodll_msw_clipbrd.o \
+       monodll_msw_colour.o \
+       monodll_msw_cursor.o \
+       monodll_msw_data.o \
+       monodll_msw_dc.o \
+       monodll_msw_dcclient.o \
+       monodll_msw_dcmemory.o \
+       monodll_msw_dcprint.o \
+       monodll_msw_dcscreen.o \
+       monodll_msw_dialup.o \
         monodll_dib.o \
         monodll_dib.o \
-       monodll_display.o \
+       monodll_msw_display.o \
         monodll_enhmeta.o \
         monodll_enhmeta.o \
-       monodll_font.o \
-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_gdiimage.o \
-       monodll_gdiobj.o \
+       monodll_msw_font.o \
+       monodll_msw_fontenum.o \
+       monodll_msw_fontutil.o \
+       monodll_msw_gdiimage.o \
+       monodll_msw_gdiobj.o \
         monodll_gdiplus.o \
         monodll_gdiplus.o \
-       monodll_graphics.o \
-       monodll_icon.o \
-       monodll_imaglist.o \
-       monodll_minifram.o \
-       monodll_dataobj.o \
+       monodll_msw_graphics.o \
+       monodll_msw_icon.o \
+       monodll_msw_imaglist.o \
+       monodll_msw_minifram.o \
+       monodll_ole_dataobj.o \
         monodll_dropsrc.o \
         monodll_droptgt.o \
         monodll_oleutils.o \
         monodll_dropsrc.o \
         monodll_droptgt.o \
         monodll_oleutils.o \
-       monodll_palette.o \
-       monodll_pen.o \
-       monodll_popupwin.o \
-       monodll_printdlg.o \
+       monodll_msw_palette.o \
+       monodll_msw_pen.o \
+       monodll_msw_popupwin.o \
+       monodll_msw_printdlg.o \
         monodll_printwin.o \
         monodll_printwin.o \
-       monodll_region.o \
-       monodll_renderer.o \
-       monodll_settings.o \
-       monodll_tooltip.o \
-       monodll_toplevel.o \
-       monodll_utilsgui.o \
+       monodll_msw_region.o \
+       monodll_msw_renderer.o \
+       monodll_msw_settings.o \
+       monodll_msw_tooltip.o \
+       monodll_msw_toplevel.o \
+       monodll_uiaction.o \
+       monodll_msw_utilsgui.o \
         monodll_uxtheme.o \
         monodll_uxtheme.o \
-       monodll_window.o \
+       monodll_msw_window.o \
         monodll_helpchm.o \
         monodll_helpchm.o \
-       monodll_helpwin.o \
+       monodll_msw_helpwin.o \
         monodll_automtn.o \
         monodll_uuid.o
  @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1)
         monodll_automtn.o \
         monodll_uuid.o
  @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1)
@@ -5382,104 +6022,114 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 =  \
  @COND_TOOLKIT_OSX_CARBON@      = $(__OSX_LOWLEVEL_SRC_OBJECTS)
  @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \
  @COND_TOOLKIT_OSX_COCOA@       $(__OSX_LOWLEVEL_SRC_OBJECTS)
  @COND_TOOLKIT_OSX_CARBON@      = $(__OSX_LOWLEVEL_SRC_OBJECTS)
  @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \
  @COND_TOOLKIT_OSX_COCOA@       $(__OSX_LOWLEVEL_SRC_OBJECTS)
+@COND_TOOLKIT_OSX_IPHONE@__LOWLEVEL_SRC_OBJECTS_1 \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__OSX_LOWLEVEL_SRC_OBJECTS)
  @COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_1 = 
  COND_TOOLKIT_WINCE___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_activex.o \
+       monodll_msw_app.o \
+       monodll_msw_bitmap.o \
+       monodll_msw_brush.o \
+       monodll_msw_caret.o \
+       monodll_msw_clipbrd.o \
+       monodll_msw_colour.o \
+       monodll_msw_cursor.o \
+       monodll_msw_data.o \
+       monodll_msw_dc.o \
+       monodll_msw_dcclient.o \
+       monodll_msw_dcmemory.o \
+       monodll_msw_dcprint.o \
+       monodll_msw_dcscreen.o \
+       monodll_msw_dialup.o \
         monodll_dib.o \
         monodll_dib.o \
-       monodll_display.o \
+       monodll_msw_display.o \
         monodll_enhmeta.o \
         monodll_enhmeta.o \
-       monodll_font.o \
-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_gdiimage.o \
-       monodll_gdiobj.o \
+       monodll_msw_font.o \
+       monodll_msw_fontenum.o \
+       monodll_msw_fontutil.o \
+       monodll_msw_gdiimage.o \
+       monodll_msw_gdiobj.o \
         monodll_gdiplus.o \
         monodll_gdiplus.o \
-       monodll_graphics.o \
-       monodll_icon.o \
-       monodll_imaglist.o \
-       monodll_minifram.o \
-       monodll_dataobj.o \
+       monodll_msw_graphics.o \
+       monodll_msw_icon.o \
+       monodll_msw_imaglist.o \
+       monodll_msw_minifram.o \
+       monodll_ole_dataobj.o \
         monodll_dropsrc.o \
         monodll_droptgt.o \
         monodll_oleutils.o \
         monodll_dropsrc.o \
         monodll_droptgt.o \
         monodll_oleutils.o \
-       monodll_palette.o \
-       monodll_pen.o \
-       monodll_popupwin.o \
-       monodll_printdlg.o \
+       monodll_msw_palette.o \
+       monodll_msw_pen.o \
+       monodll_msw_popupwin.o \
+       monodll_msw_printdlg.o \
         monodll_printwin.o \
         monodll_printwin.o \
-       monodll_region.o \
-       monodll_renderer.o \
-       monodll_settings.o \
-       monodll_tooltip.o \
-       monodll_toplevel.o \
-       monodll_utilsgui.o \
+       monodll_msw_region.o \
+       monodll_msw_renderer.o \
+       monodll_msw_settings.o \
+       monodll_msw_tooltip.o \
+       monodll_msw_toplevel.o \
+       monodll_uiaction.o \
+       monodll_msw_utilsgui.o \
         monodll_uxtheme.o \
         monodll_uxtheme.o \
-       monodll_window.o
+       monodll_msw_window.o
  @COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_1)
  COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 =  \
  @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_imaglist.o \
-       monodll_dialup.o \
-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_utilsx11.o \
+       monodll_generic_caret.o \
+       monodll_generic_imaglist.o \
+       monodll_unix_dialup.o \
         monodll_displayx11.o \
         monodll_displayx11.o \
-       monodll_icon.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_minifram.o \
+       monodll_unix_fontenum.o \
+       monodll_unix_fontutil.o \
+       monodll_uiactionx11.o \
+       monodll_utilsx11.o \
+       monodll_generic_icon.o \
+       monodll_generic_timer.o \
+       monodll_x11_app.o \
+       monodll_x11_bitmap.o \
+       monodll_x11_brush.o \
+       monodll_x11_clipbrd.o \
+       monodll_x11_colour.o \
+       monodll_x11_cursor.o \
+       monodll_x11_data.o \
+       monodll_x11_dataobj.o \
+       monodll_x11_dc.o \
+       monodll_x11_dcclient.o \
+       monodll_x11_dcmemory.o \
+       monodll_x11_dcscreen.o \
+       monodll_x11_evtloop.o \
+       monodll_x11_font.o \
+       monodll_x11_minifram.o \
         monodll_nanox.o \
         monodll_nanox.o \
-       monodll_palette.o \
-       monodll_pen.o \
-       monodll_popupwin.o \
-       monodll_region.o \
+       monodll_x11_palette.o \
+       monodll_x11_pen.o \
+       monodll_x11_popupwin.o \
+       monodll_x11_region.o \
         monodll_reparent.o \
         monodll_reparent.o \
-       monodll_settings.o \
-       monodll_toplevel.o \
-       monodll_utils.o \
+       monodll_x11_settings.o \
+       monodll_x11_toplevel.o \
+       monodll_x11_utils.o \
         monodll_utilsx.o \
         monodll_utilsx.o \
-       monodll_window.o
+       monodll_x11_window.o
  @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1)
  COND_WXUNIV_0___ADVANCED_SRC_OBJECTS =  \
         monodll_animatecmn.o \
         monodll_bmpcboxcmn.o \
         monodll_calctrlcmn.o \
         monodll_datavcmn.o \
  @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1)
  COND_WXUNIV_0___ADVANCED_SRC_OBJECTS =  \
         monodll_animatecmn.o \
         monodll_bmpcboxcmn.o \
         monodll_calctrlcmn.o \
         monodll_datavcmn.o \
+       monodll_gridcmn.o \
         monodll_hyperlnkcmn.o \
         monodll_hyperlnkcmn.o \
+       monodll_odcombocmn.o \
         monodll_aboutdlgg.o \
         monodll_aboutdlgg.o \
+       monodll_bannerwindow.o \
         monodll_bmpcboxg.o \
         monodll_calctrlg.o \
         monodll_bmpcboxg.o \
         monodll_calctrlg.o \
+       monodll_commandlinkbuttong.o \
         monodll_datavgen.o \
         monodll_datectlg.o \
         monodll_editlbox.o \
         monodll_grid.o \
         monodll_gridctrl.o \
         monodll_datavgen.o \
         monodll_datectlg.o \
         monodll_editlbox.o \
         monodll_grid.o \
         monodll_gridctrl.o \
+       monodll_grideditors.o \
         monodll_gridsel.o \
         monodll_helpext.o \
         monodll_hyperlinkg.o \
         monodll_gridsel.o \
         monodll_helpext.o \
         monodll_hyperlinkg.o \
@@ -5490,6 +6140,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS =  \
         monodll_sashwin.o \
         monodll_splash.o \
         monodll_tipdlg.o \
         monodll_sashwin.o \
         monodll_splash.o \
         monodll_tipdlg.o \
+       monodll_treelist.o \
         monodll_wizard.o \
         $(__ADVANCED_PLATFORM_SRC_OBJECTS) \
         $(__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS)
         monodll_wizard.o \
         $(__ADVANCED_PLATFORM_SRC_OBJECTS) \
         $(__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS)
@@ -5499,15 +6150,20 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS =  \
         monodll_bmpcboxcmn.o \
         monodll_calctrlcmn.o \
         monodll_datavcmn.o \
         monodll_bmpcboxcmn.o \
         monodll_calctrlcmn.o \
         monodll_datavcmn.o \
+       monodll_gridcmn.o \
         monodll_hyperlnkcmn.o \
         monodll_hyperlnkcmn.o \
+       monodll_odcombocmn.o \
         monodll_aboutdlgg.o \
         monodll_aboutdlgg.o \
+       monodll_bannerwindow.o \
         monodll_bmpcboxg.o \
         monodll_calctrlg.o \
         monodll_bmpcboxg.o \
         monodll_calctrlg.o \
+       monodll_commandlinkbuttong.o \
         monodll_datavgen.o \
         monodll_datectlg.o \
         monodll_editlbox.o \
         monodll_grid.o \
         monodll_gridctrl.o \
         monodll_datavgen.o \
         monodll_datectlg.o \
         monodll_editlbox.o \
         monodll_grid.o \
         monodll_gridctrl.o \
+       monodll_grideditors.o \
         monodll_gridsel.o \
         monodll_helpext.o \
         monodll_hyperlinkg.o \
         monodll_gridsel.o \
         monodll_helpext.o \
         monodll_hyperlinkg.o \
@@ -5518,162 +6174,177 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS =  \
         monodll_sashwin.o \
         monodll_splash.o \
         monodll_tipdlg.o \
         monodll_sashwin.o \
         monodll_splash.o \
         monodll_tipdlg.o \
+       monodll_treelist.o \
         monodll_wizard.o \
         $(__ADVANCED_PLATFORM_SRC_OBJECTS) \
         monodll_animateg.o
  @COND_WXUNIV_1@__ADVANCED_SRC_OBJECTS = $(COND_WXUNIV_1___ADVANCED_SRC_OBJECTS)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS =  \
         monodll_wizard.o \
         $(__ADVANCED_PLATFORM_SRC_OBJECTS) \
         monodll_animateg.o
  @COND_WXUNIV_1@__ADVANCED_SRC_OBJECTS = $(COND_WXUNIV_1___ADVANCED_SRC_OBJECTS)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS =  \
-       monodll_aboutdlg.o \
+       monodll_gtk_aboutdlg.o \
         monodll_animate.o \
         monodll_animate.o \
-       monodll_bmpcbox.o \
-       monodll_calctrl.o \
-       monodll_dataview.o \
-       monodll_hyperlink.o
+       monodll_gtk_bmpcbox.o \
+       monodll_gtk_calctrl.o \
+       monodll_gtk_dataview.o \
+       monodll_gtk_hyperlink.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS)
  COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS =  \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS)
  COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS =  \
-       monodll_bmpcbox.o \
-       monodll_calctrl.o \
+       monodll_animateg.o \
+       monodll_msw_bmpcbox.o \
+       monodll_msw_calctrl.o \
+       monodll_commandlinkbutton.o \
         monodll_datecontrols.o \
         monodll_datecontrols.o \
-       monodll_datectrl.o
+       monodll_datectrl.o \
+       monodll_msw_hyperlink.o
  @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS)
  COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS =  \
  @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS)
  COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS =  \
-       monodll_bmpcbox.o \
-       monodll_calctrl.o \
+       monodll_animateg.o \
+       monodll_msw_bmpcbox.o \
+       monodll_msw_calctrl.o \
+       monodll_commandlinkbutton.o \
         monodll_datecontrols.o \
         monodll_datecontrols.o \
-       monodll_datectrl.o
+       monodll_datectrl.o \
+       monodll_msw_hyperlink.o
  @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS)
  @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS)
-@COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_mediactrl.o
-@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_mediactrl.o 
-@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_mediactrl.o
-COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS =  \
-       monodll_mediactrl_am.o \
-       monodll_mediactrl_wmp10.o \
-       monodll_mediactrl_qt.o \
-       monodll_activex.o
-@COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS)
-@COND_TOOLKIT_OSX_CARBON@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_mediactrl.o
+@COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS = \
+@COND_TOOLKIT_COCOA@   monodll_cocoa_mediactrl.o
+@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_unix_mediactrl.o 
+@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_unix_mediactrl.o
+@COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS = \
+@COND_TOOLKIT_MSW@     monodll_mediactrl_am.o monodll_mediactrl_wmp10.o \
+@COND_TOOLKIT_MSW@     monodll_mediactrl_qt.o
+@COND_TOOLKIT_OSX_CARBON@__MEDIA_PLATFORM_SRC_OBJECTS \
+@COND_TOOLKIT_OSX_CARBON@      = monodll_carbon_mediactrl.o
+@COND_TOOLKIT_OSX_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS = 
+@COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS = 
  @COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS = 
  @COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS = 
-COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS =  \
-       monodll_mediactrl_am.o \
-       monodll_mediactrl_wmp10.o \
-       monodll_mediactrl_qt.o \
-       monodll_activex.o
-@COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS)
-@COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_mediactrl.o
+@COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS = \
+@COND_TOOLKIT_WINCE@   monodll_mediactrl_am.o monodll_mediactrl_wmp10.o \
+@COND_TOOLKIT_WINCE@   monodll_mediactrl_qt.o
+@COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_unix_mediactrl.o
  @COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o
  @COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o
  @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS = monodll_helpbest.o
  @COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o
  @COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o
  @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS = monodll_helpbest.o
+@COND_PLATFORM_MACOSX_1@__WEBVIEW_SRC_PLATFORM_OBJECTS \
+@COND_PLATFORM_MACOSX_1@       = monodll_osx_webview_webkit.o
+@COND_PLATFORM_UNIX_1@__WEBVIEW_SRC_PLATFORM_OBJECTS \
+@COND_PLATFORM_UNIX_1@ = monodll_gtk_webview_webkit.o
+@COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS = monodll_webview_ie.o
  @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS \
  @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@   = monodll_sound_sdl.o
  @COND_PLATFORM_WIN32_1@__monodll___win32rc = monodll_version_rc.o
  @COND_USE_STC_1@__wxscintilla_library_link_DEP = $(__wxscintilla___depname)
  @COND_USE_STC_1@__wxscintilla_library_link_LIBR = -L$(LIBDIRNAME)
  @COND_USE_STC_1@__wxscintilla_library_link_LIBR_1 = \
  @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS \
  @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@   = monodll_sound_sdl.o
  @COND_PLATFORM_WIN32_1@__monodll___win32rc = monodll_version_rc.o
  @COND_USE_STC_1@__wxscintilla_library_link_DEP = $(__wxscintilla___depname)
  @COND_USE_STC_1@__wxscintilla_library_link_LIBR = -L$(LIBDIRNAME)
  @COND_USE_STC_1@__wxscintilla_library_link_LIBR_1 = \
-@COND_USE_STC_1@       -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_STC_1@       -lwxscintilla$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  COND_MONOLITHIC_1_SHARED_0___monolib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_MONOLITHIC_1_SHARED_0@__monolib___depname = $(COND_MONOLITHIC_1_SHARED_0___monolib___depname)
  @COND_MONOLITHIC_1_SHARED_0@__install_monolib___depname = install_monolib
  @COND_MONOLITHIC_1_SHARED_0@__uninstall_monolib___depname \
  @COND_MONOLITHIC_1_SHARED_0@   = uninstall_monolib
  COND_MONOLITHIC_1_SHARED_0___monolib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_MONOLITHIC_1_SHARED_0@__monolib___depname = $(COND_MONOLITHIC_1_SHARED_0___monolib___depname)
  @COND_MONOLITHIC_1_SHARED_0@__install_monolib___depname = install_monolib
  @COND_MONOLITHIC_1_SHARED_0@__uninstall_monolib___depname \
  @COND_MONOLITHIC_1_SHARED_0@   = uninstall_monolib
-@COND_GCC_PCH_1@__monolib_PCH_INC = -I.pch/wxprec_monolib
-@COND_ICC_PCH_1@__monolib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_monolib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_monolib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_monolib/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__monolib_PCH_INC = -I./.pch/wxprec_monolib
+@COND_ICC_PCH_1@__monolib_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_monolib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_monolib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_monolib/wx/wxprec.h.gch
  COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_1 =  \
  COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_1 =  \
-       monolib_mimetype.o \
+       monolib_core_mimetype.o \
         monolib_cfstring.o \
         monolib_cfstring.o \
-       monolib_gsockosx.o \
+       monolib_evtloop_cf.o \
         monolib_stdpaths_cf.o \
         monolib_strconv_cf.o \
         monolib_utilsexc_base.o \
         monolib_fdiodispatcher.o \
         monolib_selectdispatcher.o \
         monolib_stdpaths_cf.o \
         monolib_strconv_cf.o \
         monolib_utilsexc_base.o \
         monolib_fdiodispatcher.o \
         monolib_selectdispatcher.o \
-       monolib_epolldispatcher.o \
         monolib_appunix.o \
         monolib_appunix.o \
-       monolib_evtloopunix.o \
-       monolib_dir.o \
+       monolib_unix_dir.o \
         monolib_dlunix.o \
         monolib_dlunix.o \
-       monolib_snglinst.o \
-       monolib_stdpaths.o \
+       monolib_epolldispatcher.o \
+       monolib_evtloopunix.o \
+       monolib_fdiounix.o \
+       monolib_unix_snglinst.o \
+       monolib_unix_stackwalk.o \
+       monolib_unix_stdpaths.o \
         monolib_timerunx.o \
         monolib_threadpsx.o \
         monolib_timerunx.o \
         monolib_threadpsx.o \
-       monolib_stackwalk.o \
-       monolib_utilsunx.o
+       monolib_utilsunx.o \
+       monolib_fswatcher_kqueue.o
  @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_1)
  @COND_PLATFORM_MSDOS_1@__BASE_PLATFORM_SRC_OBJECTS_1 \
  @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_1)
  @COND_PLATFORM_MSDOS_1@__BASE_PLATFORM_SRC_OBJECTS_1 \
-@COND_PLATFORM_MSDOS_1@        = monolib_dir.o monolib_mimetype.o \
+@COND_PLATFORM_MSDOS_1@        = monolib_msdos_dir.o monolib_msdos_mimetype.o \
  @COND_PLATFORM_MSDOS_1@        monolib_utilsdos.o
  COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_1 =  \
         monolib_fdiodispatcher.o \
         monolib_selectdispatcher.o \
  @COND_PLATFORM_MSDOS_1@        monolib_utilsdos.o
  COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_1 =  \
         monolib_fdiodispatcher.o \
         monolib_selectdispatcher.o \
-       monolib_gsocketiohandler.o \
         monolib_appunix.o \
         monolib_evtloopunix.o \
         monolib_timerunx.o \
         monolib_appunix.o \
         monolib_evtloopunix.o \
         monolib_timerunx.o \
-       monolib_dir.o \
-       monolib_mimetype.o \
-       monolib_stdpaths.o \
-       monolib_thread.o \
-       monolib_utils.o \
-       monolib_utilsexc.o
+       monolib_os2_dir.o \
+       monolib_os2_mimetype.o \
+       monolib_os2_snglinst.o \
+       monolib_os2_stdpaths.o \
+       monolib_os2_thread.o \
+       monolib_os2_utils.o \
+       monolib_os2_utilsexc.o
  @COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_1)
  COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_1 =  \
         monolib_fdiodispatcher.o \
         monolib_selectdispatcher.o \
  @COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_1)
  COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_1 =  \
         monolib_fdiodispatcher.o \
         monolib_selectdispatcher.o \
-       monolib_epolldispatcher.o \
         monolib_appunix.o \
         monolib_appunix.o \
-       monolib_evtloopunix.o \
-       monolib_dir.o \
+       monolib_unix_dir.o \
         monolib_dlunix.o \
         monolib_dlunix.o \
-       monolib_snglinst.o \
-       monolib_stdpaths.o \
+       monolib_epolldispatcher.o \
+       monolib_evtloopunix.o \
+       monolib_fdiounix.o \
+       monolib_unix_snglinst.o \
+       monolib_unix_stackwalk.o \
+       monolib_unix_stdpaths.o \
         monolib_timerunx.o \
         monolib_threadpsx.o \
         monolib_timerunx.o \
         monolib_threadpsx.o \
-       monolib_stackwalk.o \
         monolib_utilsunx.o \
         monolib_utilsunx.o \
-       monolib_mimetype.o \
-       monolib_gsocketiohandler.o
+       monolib_fswatcher_kqueue.o \
+       monolib_unix_mimetype.o \
+       monolib_fswatcher_inotify.o
  @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_1)
  COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 =  \
         monolib_basemsw.o \
         monolib_crashrpt.o \
         monolib_debughlp.o \
         monolib_dde.o \
  @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_1)
  COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1 =  \
         monolib_basemsw.o \
         monolib_crashrpt.o \
         monolib_debughlp.o \
         monolib_dde.o \
-       monolib_dir.o \
+       monolib_msw_dir.o \
         monolib_dlmsw.o \
         monolib_dlmsw.o \
-       monolib_mimetype.o \
+       monolib_msw_mimetype.o \
         monolib_power.o \
         monolib_regconf.o \
         monolib_registry.o \
         monolib_power.o \
         monolib_regconf.o \
         monolib_registry.o \
-       monolib_snglinst.o \
-       monolib_stackwalk.o \
-       monolib_stdpaths.o \
-       monolib_thread.o \
-       monolib_timer.o \
-       monolib_utils.o \
-       monolib_utilsexc.o \
+       monolib_msw_snglinst.o \
+       monolib_msw_stackwalk.o \
+       monolib_msw_stdpaths.o \
+       monolib_msw_thread.o \
+       monolib_msw_timer.o \
+       monolib_msw_utils.o \
+       monolib_msw_utilsexc.o \
+       monolib_fswatcher.o \
         $(__BASE_WINCE_SRC_OBJECTS_1)
  @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1)
  @COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS_1 = monolib_time.o
  @COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 = 
  @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \
         $(__BASE_WINCE_SRC_OBJECTS_1)
  @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_1)
  @COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS_1 = monolib_time.o
  @COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 = 
  @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \
-@COND_PLATFORM_WIN32_1@        = monolib_evtloop.o monolib_main.o monolib_mslu.o \
-@COND_PLATFORM_WIN32_1@        monolib_volume.o
+@COND_PLATFORM_WIN32_1@        = monolib_msw_evtloop.o monolib_msw_main.o \
+@COND_PLATFORM_WIN32_1@        monolib_mslu.o monolib_volume.o
  @COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_1 \
  @COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_1 \
-@COND_TOOLKIT_OSX_CARBON@      = monolib_utils.o monolib_uma.o
+@COND_TOOLKIT_OSX_CARBON@      = monolib_carbon_utils.o monolib_uma.o
  @COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_1 \
  @COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_1 \
-@COND_TOOLKIT_OSX_COCOA@       = monolib_utils.o
-@COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o
-@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o
-@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_gsocket.o
-COND_PLATFORM_WIN32_1___NET_PLATFORM_SRC_OBJECTS_1 =  \
-       monolib_gsocket.o \
-       monolib_gsockmsw.o \
-       monolib_urlmsw.o \
-       $(__NET_WINCE_SRC_OBJECTS_1)
-@COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_1 = $(COND_PLATFORM_WIN32_1___NET_PLATFORM_SRC_OBJECTS_1)
+@COND_TOOLKIT_OSX_COCOA@       = monolib_osx_cocoa_utils.o
+@COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_1 \
+@COND_PLATFORM_MACOSX_1@       = monolib_socketiohandler.o monolib_sockunix.o \
+@COND_PLATFORM_MACOSX_1@       monolib_sockosx.o
+@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_1 = monolib_sockunix.o
+@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_1 = \
+@COND_PLATFORM_UNIX_1@ monolib_socketiohandler.o monolib_sockunix.o
+@COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_1 \
+@COND_PLATFORM_WIN32_1@        = monolib_sockmsw.o monolib_urlmsw.o \
+@COND_PLATFORM_WIN32_1@        $(__NET_WINCE_SRC_OBJECTS_1)
  @COND_TOOLKIT_WINCE@__NET_WINCE_SRC_OBJECTS_1 = monolib_net.o
  COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
         $(__CORE_SRC_OBJECTS_1) \
  @COND_TOOLKIT_WINCE@__NET_WINCE_SRC_OBJECTS_1 = monolib_net.o
  COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
         $(__CORE_SRC_OBJECTS_1) \
@@ -5700,13 +6371,19 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
         monolib_m_links.o \
         monolib_m_list.o \
         monolib_m_pre.o \
         monolib_m_links.o \
         monolib_m_list.o \
         monolib_m_pre.o \
+       monolib_m_span.o \
         monolib_m_style.o \
         monolib_m_tables.o \
         monolib_m_style.o \
         monolib_m_tables.o \
+       monolib_styleparams.o \
         monolib_winpars.o \
         monolib_htmllbox.o \
         monolib_winpars.o \
         monolib_htmllbox.o \
+       $(__WEBVIEW_SRC_PLATFORM_OBJECTS_1) \
+       monolib_webview.o \
+       monolib_webviewarchivehandler.o \
         monolib_debugrpt.o \
         monolib_dbgrptg.o \
         monolib_xh_animatctrl.o \
         monolib_debugrpt.o \
         monolib_dbgrptg.o \
         monolib_xh_animatctrl.o \
+       monolib_xh_bannerwindow.o \
         monolib_xh_bmp.o \
         monolib_xh_bmpcbox.o \
         monolib_xh_bmpbt.o \
         monolib_xh_bmp.o \
         monolib_xh_bmpcbox.o \
         monolib_xh_bmpbt.o \
@@ -5717,15 +6394,18 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
         monolib_xh_choic.o \
         monolib_xh_choicbk.o \
         monolib_xh_clrpicker.o \
         monolib_xh_choic.o \
         monolib_xh_choicbk.o \
         monolib_xh_clrpicker.o \
+       monolib_xh_cmdlinkbn.o \
         monolib_xh_collpane.o \
         monolib_xh_combo.o \
         monolib_xh_collpane.o \
         monolib_xh_combo.o \
+       monolib_xh_comboctrl.o \
         monolib_xh_datectrl.o \
         monolib_xh_dirpicker.o \
         monolib_xh_dlg.o \
         monolib_xh_datectrl.o \
         monolib_xh_dirpicker.o \
         monolib_xh_dlg.o \
-       monolib_xh_frame.o \
-       monolib_xh_mdi.o \
+       monolib_xh_editlbox.o \
+       monolib_xh_filectrl.o \
         monolib_xh_filepicker.o \
         monolib_xh_fontpicker.o \
         monolib_xh_filepicker.o \
         monolib_xh_fontpicker.o \
+       monolib_xh_frame.o \
         monolib_xh_gauge.o \
         monolib_xh_gdctl.o \
         monolib_xh_grid.o \
         monolib_xh_gauge.o \
         monolib_xh_gdctl.o \
         monolib_xh_grid.o \
@@ -5734,6 +6414,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
         monolib_xh_listb.o \
         monolib_xh_listbk.o \
         monolib_xh_listc.o \
         monolib_xh_listb.o \
         monolib_xh_listbk.o \
         monolib_xh_listc.o \
+       monolib_xh_mdi.o \
         monolib_xh_menu.o \
         monolib_xh_notbk.o \
         monolib_xh_odcombo.o \
         monolib_xh_menu.o \
         monolib_xh_notbk.o \
         monolib_xh_odcombo.o \
@@ -5757,6 +6438,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
         monolib_xh_text.o \
         monolib_xh_tglbtn.o \
         monolib_xh_toolb.o \
         monolib_xh_text.o \
         monolib_xh_tglbtn.o \
         monolib_xh_toolb.o \
+       monolib_xh_toolbk.o \
         monolib_xh_tree.o \
         monolib_xh_treebk.o \
         monolib_xh_unkwn.o \
         monolib_xh_tree.o \
         monolib_xh_treebk.o \
         monolib_xh_unkwn.o \
@@ -5770,15 +6452,34 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
         monolib_auibook.o \
         monolib_auibar.o \
         monolib_tabmdi.o \
         monolib_auibook.o \
         monolib_auibar.o \
         monolib_tabmdi.o \
-       monolib_richtextctrl.o \
+       monolib_advprops.o \
+       monolib_editors.o \
+       monolib_manager.o \
+       monolib_property.o \
+       monolib_propgrid.o \
+       monolib_propgridiface.o \
+       monolib_propgridpagestate.o \
+       monolib_props.o \
+       monolib_art_internal.o \
+       monolib_art_msw.o \
+       monolib_art_aui.o \
+       monolib_bar.o \
+       monolib_ribbon_buttonbar.o \
+       monolib_ribbon_control.o \
+       monolib_gallery.o \
+       monolib_page.o \
+       monolib_ribbon_panel.o \
+       monolib_ribbon_toolbar.o \
         monolib_richtextbuffer.o \
         monolib_richtextbuffer.o \
-       monolib_richtextstyles.o \
-       monolib_richtextxml.o \
-       monolib_richtexthtml.o \
+       monolib_richtextctrl.o \
         monolib_richtextformatdlg.o \
         monolib_richtextformatdlg.o \
-       monolib_richtextsymboldlg.o \
-       monolib_richtextstyledlg.o \
+       monolib_richtexthtml.o \
+       monolib_richtextimagedlg.o \
         monolib_richtextprint.o \
         monolib_richtextprint.o \
+       monolib_richtextstyledlg.o \
+       monolib_richtextstyles.o \
+       monolib_richtextsymboldlg.o \
+       monolib_richtextxml.o \
         monolib_stc.o \
         monolib_PlatWX.o \
         monolib_ScintillaWX.o
         monolib_stc.o \
         monolib_PlatWX.o \
         monolib_ScintillaWX.o
@@ -5790,17 +6491,23 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
         monolib_accelcmn.o \
         monolib_accesscmn.o \
         monolib_anidecod.o \
         monolib_accelcmn.o \
         monolib_accesscmn.o \
         monolib_anidecod.o \
+       monolib_affinematrix2d.o \
         monolib_appcmn.o \
         monolib_artprov.o \
         monolib_artstd.o \
         monolib_appcmn.o \
         monolib_artprov.o \
         monolib_artstd.o \
+       monolib_arttango.o \
         monolib_bmpbase.o \
         monolib_bmpbase.o \
+       monolib_bmpbtncmn.o \
         monolib_bookctrl.o \
         monolib_btncmn.o \
         monolib_cairo.o \
         monolib_bookctrl.o \
         monolib_btncmn.o \
         monolib_cairo.o \
+       monolib_checkboxcmn.o \
+       monolib_checklstcmn.o \
         monolib_choiccmn.o \
         monolib_clipcmn.o \
         monolib_clrpickercmn.o \
         monolib_colourcmn.o \
         monolib_choiccmn.o \
         monolib_clipcmn.o \
         monolib_clrpickercmn.o \
         monolib_colourcmn.o \
+       monolib_colourdata.o \
         monolib_combocmn.o \
         monolib_cmdproc.o \
         monolib_cmndata.o \
         monolib_combocmn.o \
         monolib_cmdproc.o \
         monolib_cmndata.o \
@@ -5808,11 +6515,11 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
         monolib_cshelp.o \
         monolib_ctrlcmn.o \
         monolib_ctrlsub.o \
         monolib_cshelp.o \
         monolib_ctrlcmn.o \
         monolib_ctrlsub.o \
-       monolib_datacmn.o \
         monolib_dcbase.o \
         monolib_dcbufcmn.o \
         monolib_dcgraph.o \
         monolib_dcsvg.o \
         monolib_dcbase.o \
         monolib_dcbufcmn.o \
         monolib_dcgraph.o \
         monolib_dcsvg.o \
+       monolib_dirctrlcmn.o \
         monolib_dlgcmn.o \
         monolib_dndcmn.o \
         monolib_dobjcmn.o \
         monolib_dlgcmn.o \
         monolib_dndcmn.o \
         monolib_dobjcmn.o \
@@ -5823,10 +6530,13 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
         monolib_effects.o \
         monolib_fddlgcmn.o \
         monolib_filectrlcmn.o \
         monolib_effects.o \
         monolib_fddlgcmn.o \
         monolib_filectrlcmn.o \
+       monolib_filehistorycmn.o \
         monolib_filepickercmn.o \
         monolib_fontpickercmn.o \
         monolib_fldlgcmn.o \
         monolib_fontcmn.o \
         monolib_filepickercmn.o \
         monolib_fontpickercmn.o \
         monolib_fldlgcmn.o \
         monolib_fontcmn.o \
+       monolib_fontdata.o \
+       monolib_graphicc.o \
         monolib_fontenumcmn.o \
         monolib_fontmap.o \
         monolib_fontutilcmn.o \
         monolib_fontenumcmn.o \
         monolib_fontmap.o \
         monolib_fontutilcmn.o \
@@ -5837,6 +6547,8 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
         monolib_geometry.o \
         monolib_gifdecod.o \
         monolib_graphcmn.o \
         monolib_geometry.o \
         monolib_gifdecod.o \
         monolib_graphcmn.o \
+       monolib_headercolcmn.o \
+       monolib_headerctrlcmn.o \
         monolib_helpbase.o \
         monolib_iconbndl.o \
         monolib_imagall.o \
         monolib_helpbase.o \
         monolib_iconbndl.o \
         monolib_imagall.o \
@@ -5855,22 +6567,36 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
         monolib_layout.o \
         monolib_lboxcmn.o \
         monolib_listctrlcmn.o \
         monolib_layout.o \
         monolib_lboxcmn.o \
         monolib_listctrlcmn.o \
+       monolib_markupparser.o \
         monolib_matrix.o \
         monolib_menucmn.o \
         monolib_matrix.o \
         monolib_menucmn.o \
+       monolib_mousemanager.o \
         monolib_nbkbase.o \
         monolib_overlaycmn.o \
         monolib_nbkbase.o \
         monolib_overlaycmn.o \
+       monolib_ownerdrwcmn.o \
         monolib_paper.o \
         monolib_paper.o \
+       monolib_panelcmn.o \
+       monolib_persist.o \
         monolib_pickerbase.o \
         monolib_popupcmn.o \
         monolib_prntbase.o \
         monolib_quantize.o \
         monolib_pickerbase.o \
         monolib_popupcmn.o \
         monolib_prntbase.o \
         monolib_quantize.o \
+       monolib_radiobtncmn.o \
         monolib_radiocmn.o \
         monolib_radiocmn.o \
+       monolib_rearrangectrl.o \
         monolib_rendcmn.o \
         monolib_rgncmn.o \
         monolib_rendcmn.o \
         monolib_rgncmn.o \
+       monolib_scrolbarcmn.o \
         monolib_settcmn.o \
         monolib_sizer.o \
         monolib_settcmn.o \
         monolib_sizer.o \
+       monolib_slidercmn.o \
+       monolib_spinbtncmn.o \
+       monolib_spinctrlcmn.o \
         monolib_srchcmn.o \
         monolib_statbar.o \
         monolib_srchcmn.o \
         monolib_statbar.o \
+       monolib_statbmpcmn.o \
+       monolib_statboxcmn.o \
+       monolib_statlinecmn.o \
         monolib_stattextcmn.o \
         monolib_stockitem.o \
         monolib_tbarbase.o \
         monolib_stattextcmn.o \
         monolib_stockitem.o \
         monolib_tbarbase.o \
@@ -5878,15 +6604,17 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
         monolib_textentrycmn.o \
         monolib_toplvcmn.o \
         monolib_treebase.o \
         monolib_textentrycmn.o \
         monolib_toplvcmn.o \
         monolib_treebase.o \
+       monolib_uiactioncmn.o \
         monolib_valgen.o \
         monolib_validate.o \
         monolib_valtext.o \
         monolib_valgen.o \
         monolib_validate.o \
         monolib_valtext.o \
+       monolib_valnum.o \
         monolib_wincmn.o \
         monolib_windowid.o \
         monolib_wrapsizer.o \
         monolib_xpmdecod.o \
         monolib_busyinfo.o \
         monolib_wincmn.o \
         monolib_windowid.o \
         monolib_wrapsizer.o \
         monolib_xpmdecod.o \
         monolib_busyinfo.o \
-       monolib_buttonbar.o \
+       monolib_generic_buttonbar.o \
         monolib_choicdgg.o \
         monolib_choicbkg.o \
         monolib_combog.o \
         monolib_choicdgg.o \
         monolib_choicbkg.o \
         monolib_combog.o \
@@ -5894,19 +6622,25 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
         monolib_dirctrlg.o \
         monolib_dragimgg.o \
         monolib_filectrlg.o \
         monolib_dirctrlg.o \
         monolib_dragimgg.o \
         monolib_filectrlg.o \
+       monolib_headerctrlg.o \
+       monolib_generic_infobar.o \
         monolib_listbkg.o \
         monolib_logg.o \
         monolib_listbkg.o \
         monolib_logg.o \
+       monolib_markuptext.o \
+       monolib_msgdlgg.o \
         monolib_numdlgg.o \
         monolib_panelg.o \
         monolib_progdlgg.o \
         monolib_printps.o \
         monolib_renderg.o \
         monolib_numdlgg.o \
         monolib_panelg.o \
         monolib_progdlgg.o \
         monolib_printps.o \
         monolib_renderg.o \
+       monolib_richmsgdlgg.o \
         monolib_scrlwing.o \
         monolib_selstore.o \
         monolib_spinctlg.o \
         monolib_splitter.o \
         monolib_srchctlg.o \
         monolib_statbmpg.o \
         monolib_scrlwing.o \
         monolib_selstore.o \
         monolib_spinctlg.o \
         monolib_splitter.o \
         monolib_srchctlg.o \
         monolib_statbmpg.o \
+       monolib_stattextg.o \
         monolib_textdlgg.o \
         monolib_tipwin.o \
         monolib_toolbkg.o \
         monolib_textdlgg.o \
         monolib_tipwin.o \
         monolib_toolbkg.o \
@@ -5918,55 +6652,53 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
  COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
         $(__LOWLEVEL_SRC_OBJECTS_3) \
         $(__PLATFORM_SRC_OBJECTS_0) \
  COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
         $(__LOWLEVEL_SRC_OBJECTS_3) \
         $(__PLATFORM_SRC_OBJECTS_0) \
-       monolib_accel.o \
+       monolib_generic_accel.o \
         monolib_clrpickerg.o \
         monolib_collpaneg.o \
         monolib_colrdlgg.o \
         monolib_dirdlgg.o \
         monolib_clrpickerg.o \
         monolib_collpaneg.o \
         monolib_colrdlgg.o \
         monolib_dirdlgg.o \
-       monolib_fdrepdlg.o \
+       monolib_generic_fdrepdlg.o \
         monolib_filedlgg.o \
         monolib_filepickerg.o \
         monolib_fontdlgg.o \
         monolib_fontpickerg.o \
         monolib_filedlgg.o \
         monolib_filepickerg.o \
         monolib_fontdlgg.o \
         monolib_fontpickerg.o \
-       monolib_listctrl.o \
+       monolib_generic_listctrl.o \
         monolib_mdig.o \
         monolib_mdig.o \
-       monolib_msgdlgg.o \
         monolib_prntdlgg.o \
         monolib_prntdlgg.o \
-       monolib_tabg.o \
-       monolib_bmpbuttn.o \
-       monolib_button.o \
-       monolib_checkbox.o \
-       monolib_checklst.o \
-       monolib_choice.o \
-       monolib_combobox.o \
-       monolib_control.o \
+       monolib_univ_bmpbuttn.o \
+       monolib_univ_button.o \
+       monolib_univ_checkbox.o \
+       monolib_univ_checklst.o \
+       monolib_univ_choice.o \
+       monolib_univ_combobox.o \
+       monolib_univ_control.o \
         monolib_ctrlrend.o \
         monolib_ctrlrend.o \
-       monolib_dialog.o \
+       monolib_univ_dialog.o \
         monolib_framuniv.o \
         monolib_framuniv.o \
-       monolib_gauge.o \
+       monolib_univ_gauge.o \
         monolib_inpcons.o \
         monolib_inphand.o \
         monolib_inpcons.o \
         monolib_inphand.o \
-       monolib_listbox.o \
-       monolib_menu.o \
-       monolib_notebook.o \
-       monolib_radiobox.o \
-       monolib_radiobut.o \
+       monolib_univ_listbox.o \
+       monolib_univ_menu.o \
+       monolib_univ_notebook.o \
+       monolib_univ_radiobox.o \
+       monolib_univ_radiobut.o \
         monolib_scrarrow.o \
         monolib_scrarrow.o \
-       monolib_scrolbar.o \
+       monolib_univ_scrolbar.o \
         monolib_scrthumb.o \
         monolib_settingsuniv.o \
         monolib_scrthumb.o \
         monolib_settingsuniv.o \
-       monolib_slider.o \
-       monolib_spinbutt.o \
-       monolib_statbmp.o \
-       monolib_statbox.o \
-       monolib_statline.o \
-       monolib_stattext.o \
-       monolib_statusbr.o \
+       monolib_univ_slider.o \
+       monolib_univ_spinbutt.o \
+       monolib_univ_statbmp.o \
+       monolib_univ_statbox.o \
+       monolib_univ_statline.o \
+       monolib_univ_stattext.o \
+       monolib_univ_statusbr.o \
         monolib_stdrend.o \
         monolib_stdrend.o \
-       monolib_textctrl.o \
-       monolib_tglbtn.o \
+       monolib_univ_textctrl.o \
+       monolib_univ_tglbtn.o \
         monolib_theme.o \
         monolib_theme.o \
-       monolib_toolbar.o \
+       monolib_univ_toolbar.o \
         monolib_topluniv.o \
         monolib_winuniv.o \
         monolib_gtk.o \
         monolib_topluniv.o \
         monolib_winuniv.o \
         monolib_gtk.o \
@@ -5976,17 +6708,23 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
         monolib_accelcmn.o \
         monolib_accesscmn.o \
         monolib_anidecod.o \
         monolib_accelcmn.o \
         monolib_accesscmn.o \
         monolib_anidecod.o \
+       monolib_affinematrix2d.o \
         monolib_appcmn.o \
         monolib_artprov.o \
         monolib_artstd.o \
         monolib_appcmn.o \
         monolib_artprov.o \
         monolib_artstd.o \
+       monolib_arttango.o \
         monolib_bmpbase.o \
         monolib_bmpbase.o \
+       monolib_bmpbtncmn.o \
         monolib_bookctrl.o \
         monolib_btncmn.o \
         monolib_cairo.o \
         monolib_bookctrl.o \
         monolib_btncmn.o \
         monolib_cairo.o \
+       monolib_checkboxcmn.o \
+       monolib_checklstcmn.o \
         monolib_choiccmn.o \
         monolib_clipcmn.o \
         monolib_clrpickercmn.o \
         monolib_colourcmn.o \
         monolib_choiccmn.o \
         monolib_clipcmn.o \
         monolib_clrpickercmn.o \
         monolib_colourcmn.o \
+       monolib_colourdata.o \
         monolib_combocmn.o \
         monolib_cmdproc.o \
         monolib_cmndata.o \
         monolib_combocmn.o \
         monolib_cmdproc.o \
         monolib_cmndata.o \
@@ -5994,11 +6732,11 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
         monolib_cshelp.o \
         monolib_ctrlcmn.o \
         monolib_ctrlsub.o \
         monolib_cshelp.o \
         monolib_ctrlcmn.o \
         monolib_ctrlsub.o \
-       monolib_datacmn.o \
         monolib_dcbase.o \
         monolib_dcbufcmn.o \
         monolib_dcgraph.o \
         monolib_dcsvg.o \
         monolib_dcbase.o \
         monolib_dcbufcmn.o \
         monolib_dcgraph.o \
         monolib_dcsvg.o \
+       monolib_dirctrlcmn.o \
         monolib_dlgcmn.o \
         monolib_dndcmn.o \
         monolib_dobjcmn.o \
         monolib_dlgcmn.o \
         monolib_dndcmn.o \
         monolib_dobjcmn.o \
@@ -6009,10 +6747,13 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
         monolib_effects.o \
         monolib_fddlgcmn.o \
         monolib_filectrlcmn.o \
         monolib_effects.o \
         monolib_fddlgcmn.o \
         monolib_filectrlcmn.o \
+       monolib_filehistorycmn.o \
         monolib_filepickercmn.o \
         monolib_fontpickercmn.o \
         monolib_fldlgcmn.o \
         monolib_fontcmn.o \
         monolib_filepickercmn.o \
         monolib_fontpickercmn.o \
         monolib_fldlgcmn.o \
         monolib_fontcmn.o \
+       monolib_fontdata.o \
+       monolib_graphicc.o \
         monolib_fontenumcmn.o \
         monolib_fontmap.o \
         monolib_fontutilcmn.o \
         monolib_fontenumcmn.o \
         monolib_fontmap.o \
         monolib_fontutilcmn.o \
@@ -6023,6 +6764,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
         monolib_geometry.o \
         monolib_gifdecod.o \
         monolib_graphcmn.o \
         monolib_geometry.o \
         monolib_gifdecod.o \
         monolib_graphcmn.o \
+       monolib_headercolcmn.o \
+       monolib_headerctrlcmn.o \
         monolib_helpbase.o \
         monolib_iconbndl.o \
         monolib_imagall.o \
         monolib_helpbase.o \
         monolib_iconbndl.o \
         monolib_imagall.o \
@@ -6041,22 +6784,36 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
         monolib_layout.o \
         monolib_lboxcmn.o \
         monolib_listctrlcmn.o \
         monolib_layout.o \
         monolib_lboxcmn.o \
         monolib_listctrlcmn.o \
+       monolib_markupparser.o \
         monolib_matrix.o \
         monolib_menucmn.o \
         monolib_matrix.o \
         monolib_menucmn.o \
+       monolib_mousemanager.o \
         monolib_nbkbase.o \
         monolib_overlaycmn.o \
         monolib_nbkbase.o \
         monolib_overlaycmn.o \
+       monolib_ownerdrwcmn.o \
         monolib_paper.o \
         monolib_paper.o \
+       monolib_panelcmn.o \
+       monolib_persist.o \
         monolib_pickerbase.o \
         monolib_popupcmn.o \
         monolib_prntbase.o \
         monolib_quantize.o \
         monolib_pickerbase.o \
         monolib_popupcmn.o \
         monolib_prntbase.o \
         monolib_quantize.o \
+       monolib_radiobtncmn.o \
         monolib_radiocmn.o \
         monolib_radiocmn.o \
+       monolib_rearrangectrl.o \
         monolib_rendcmn.o \
         monolib_rgncmn.o \
         monolib_rendcmn.o \
         monolib_rgncmn.o \
+       monolib_scrolbarcmn.o \
         monolib_settcmn.o \
         monolib_sizer.o \
         monolib_settcmn.o \
         monolib_sizer.o \
+       monolib_slidercmn.o \
+       monolib_spinbtncmn.o \
+       monolib_spinctrlcmn.o \
         monolib_srchcmn.o \
         monolib_statbar.o \
         monolib_srchcmn.o \
         monolib_statbar.o \
+       monolib_statbmpcmn.o \
+       monolib_statboxcmn.o \
+       monolib_statlinecmn.o \
         monolib_stattextcmn.o \
         monolib_stockitem.o \
         monolib_tbarbase.o \
         monolib_stattextcmn.o \
         monolib_stockitem.o \
         monolib_tbarbase.o \
@@ -6064,15 +6821,17 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
         monolib_textentrycmn.o \
         monolib_toplvcmn.o \
         monolib_treebase.o \
         monolib_textentrycmn.o \
         monolib_toplvcmn.o \
         monolib_treebase.o \
+       monolib_uiactioncmn.o \
         monolib_valgen.o \
         monolib_validate.o \
         monolib_valtext.o \
         monolib_valgen.o \
         monolib_validate.o \
         monolib_valtext.o \
+       monolib_valnum.o \
         monolib_wincmn.o \
         monolib_windowid.o \
         monolib_wrapsizer.o \
         monolib_xpmdecod.o \
         monolib_busyinfo.o \
         monolib_wincmn.o \
         monolib_windowid.o \
         monolib_wrapsizer.o \
         monolib_xpmdecod.o \
         monolib_busyinfo.o \
-       monolib_buttonbar.o \
+       monolib_generic_buttonbar.o \
         monolib_choicdgg.o \
         monolib_choicbkg.o \
         monolib_combog.o \
         monolib_choicdgg.o \
         monolib_choicbkg.o \
         monolib_combog.o \
@@ -6080,19 +6839,25 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
         monolib_dirctrlg.o \
         monolib_dragimgg.o \
         monolib_filectrlg.o \
         monolib_dirctrlg.o \
         monolib_dragimgg.o \
         monolib_filectrlg.o \
+       monolib_headerctrlg.o \
+       monolib_generic_infobar.o \
         monolib_listbkg.o \
         monolib_logg.o \
         monolib_listbkg.o \
         monolib_logg.o \
+       monolib_markuptext.o \
+       monolib_msgdlgg.o \
         monolib_numdlgg.o \
         monolib_panelg.o \
         monolib_progdlgg.o \
         monolib_printps.o \
         monolib_renderg.o \
         monolib_numdlgg.o \
         monolib_panelg.o \
         monolib_progdlgg.o \
         monolib_printps.o \
         monolib_renderg.o \
+       monolib_richmsgdlgg.o \
         monolib_scrlwing.o \
         monolib_selstore.o \
         monolib_spinctlg.o \
         monolib_splitter.o \
         monolib_srchctlg.o \
         monolib_statbmpg.o \
         monolib_scrlwing.o \
         monolib_selstore.o \
         monolib_spinctlg.o \
         monolib_splitter.o \
         monolib_srchctlg.o \
         monolib_statbmpg.o \
+       monolib_stattextg.o \
         monolib_textdlgg.o \
         monolib_tipwin.o \
         monolib_toolbkg.o \
         monolib_textdlgg.o \
         monolib_tipwin.o \
         monolib_toolbkg.o \
@@ -6105,299 +6870,309 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
  @COND_TOOLKIT_COCOA@   monolib_hid.o monolib_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_2 =  \
         monolib_fontmgrcmn.o \
  @COND_TOOLKIT_COCOA@   monolib_hid.o monolib_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_2 =  \
         monolib_fontmgrcmn.o \
-       monolib_caret.o \
-       monolib_colour.o \
-       monolib_icon.o \
-       monolib_imaglist.o \
+       monolib_generic_caret.o \
+       monolib_generic_colour.o \
+       monolib_generic_icon.o \
+       monolib_generic_imaglist.o \
         monolib_mask.o \
         monolib_mask.o \
-       monolib_timer.o \
-       monolib_app.o \
-       monolib_bitmap.o \
-       monolib_brush.o \
-       monolib_cursor.o \
-       monolib_dc.o \
-       monolib_dcclient.o \
-       monolib_dcmemory.o \
-       monolib_dcscreen.o \
-       monolib_evtloop.o \
-       monolib_font.o \
-       monolib_fontenum.o \
-       monolib_fontmgr.o \
-       monolib_nonownedwnd.o \
-       monolib_overlay.o \
-       monolib_pen.o \
-       monolib_region.o \
-       monolib_settings.o \
-       monolib_toplevel.o \
-       monolib_utils.o \
-       monolib_window.o \
+       monolib_dfb_app.o \
+       monolib_dfb_bitmap.o \
+       monolib_dfb_brush.o \
+       monolib_dfb_cursor.o \
+       monolib_dfb_dc.o \
+       monolib_dfb_dcclient.o \
+       monolib_dfb_dcmemory.o \
+       monolib_dfb_dcscreen.o \
+       monolib_dfb_evtloop.o \
+       monolib_dfb_font.o \
+       monolib_dfb_fontenum.o \
+       monolib_dfb_fontmgr.o \
+       monolib_dfb_nonownedwnd.o \
+       monolib_dfb_overlay.o \
+       monolib_dfb_pen.o \
+       monolib_dfb_region.o \
+       monolib_dfb_settings.o \
+       monolib_dfb_toplevel.o \
+       monolib_dfb_utils.o \
+       monolib_dfb_window.o \
         monolib_wrapdfb.o
  @COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_2)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_2 =  \
         monolib_wrapdfb.o
  @COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_2)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_2 =  \
-       monolib_caret.o \
-       monolib_imaglist.o \
-       monolib_dialup.o \
-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_utilsx11.o \
+       monolib_generic_caret.o \
+       monolib_generic_imaglist.o \
+       monolib_unix_dialup.o \
         monolib_displayx11.o \
         monolib_displayx11.o \
-       monolib_icon.o \
+       monolib_unix_fontenum.o \
+       monolib_unix_fontutil.o \
+       monolib_uiactionx11.o \
+       monolib_utilsx11.o \
+       monolib_generic_icon.o \
         monolib_paletteg.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_gsockgtk.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
+       monolib_gtk1_app.o \
+       monolib_gtk1_bitmap.o \
+       monolib_gtk1_brush.o \
+       monolib_gtk1_clipbrd.o \
+       monolib_gtk1_colour.o \
+       monolib_gtk1_cursor.o \
+       monolib_gtk1_data.o \
+       monolib_gtk1_dataobj.o \
+       monolib_gtk1_dc.o \
+       monolib_gtk1_dcclient.o \
+       monolib_gtk1_dcmemory.o \
+       monolib_gtk1_dcscreen.o \
+       monolib_gtk1_dnd.o \
+       monolib_gtk1_evtloop.o \
+       monolib_gtk1_font.o \
+       monolib_gtk1_sockgtk.o \
+       monolib_gtk1_main.o \
+       monolib_gtk1_minifram.o \
+       monolib_gtk1_pen.o \
+       monolib_gtk1_popupwin.o \
+       monolib_gtk1_region.o \
+       monolib_gtk1_renderer.o \
+       monolib_gtk1_settings.o \
+       monolib_gtk1_timer.o \
+       monolib_gtk1_tooltip.o \
+       monolib_gtk1_toplevel.o \
+       monolib_gtk1_utilsgtk.o \
+       monolib_gtk1_win_gtk.o \
+       monolib_gtk1_window.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_2)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_2 =  \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_2)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_2 =  \
-       monolib_caret.o \
-       monolib_imaglist.o \
-       monolib_dialup.o \
-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_utilsx11.o \
+       monolib_generic_caret.o \
+       monolib_generic_imaglist.o \
+       monolib_unix_dialup.o \
         monolib_displayx11.o \
         monolib_displayx11.o \
-       monolib_icon.o \
+       monolib_unix_fontenum.o \
+       monolib_unix_fontutil.o \
+       monolib_uiactionx11.o \
+       monolib_utilsx11.o \
+       monolib_generic_icon.o \
         monolib_paletteg.o \
         monolib_paletteg.o \
-       monolib_app.o \
+       monolib_gtk_app.o \
         monolib_assertdlg_gtk.o \
         monolib_assertdlg_gtk.o \
-       monolib_bitmap.o \
-       monolib_brush.o \
-       monolib_clipbrd.o \
-       monolib_colour.o \
-       monolib_cursor.o \
-       monolib_dataobj.o \
-       monolib_dc.o \
-       monolib_dcclient.o \
-       monolib_dcmemory.o \
-       monolib_dcscreen.o \
-       monolib_dnd.o \
-       monolib_evtloop.o \
+       monolib_gtk_bitmap.o \
+       monolib_gtk_brush.o \
+       monolib_gtk_clipbrd.o \
+       monolib_gtk_colour.o \
+       monolib_gtk_cursor.o \
+       monolib_gtk_dataobj.o \
+       monolib_gtk_dc.o \
+       monolib_gtk_dcclient.o \
+       monolib_gtk_dcmemory.o \
+       monolib_gtk_dcscreen.o \
+       monolib_gtk_dnd.o \
+       monolib_gtk_evtloop.o \
         monolib_filectrl.o \
         monolib_filectrl.o \
-       monolib_font.o \
-       monolib_gsockgtk.o \
-       monolib_minifram.o \
-       monolib_pen.o \
-       monolib_popupwin.o \
+       monolib_filehistory.o \
+       monolib_gtk_font.o \
+       monolib_gtk_sockgtk.o \
+       monolib_gtk_minifram.o \
+       monolib_gtk_pen.o \
+       monolib_gtk_popupwin.o \
         monolib_private.o \
         monolib_private.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
+       monolib_gtk_region.o \
+       monolib_gtk_renderer.o \
+       monolib_gtk_settings.o \
+       monolib_gtk_timer.o \
+       monolib_gtk_tooltip.o \
+       monolib_gtk_toplevel.o \
+       monolib_gtk_utilsgtk.o \
+       monolib_gtk_win_gtk.o \
+       monolib_gtk_window.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_2)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_2 =  \
         monolib_fontmgrcmn.o \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_2)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_2 =  \
         monolib_fontmgrcmn.o \
-       monolib_caret.o \
-       monolib_colour.o \
-       monolib_icon.o \
-       monolib_imaglist.o \
+       monolib_generic_caret.o \
+       monolib_generic_colour.o \
+       monolib_generic_icon.o \
+       monolib_generic_imaglist.o \
         monolib_mask.o \
         monolib_mask.o \
-       monolib_timer.o \
-       monolib_app.o \
-       monolib_bitmap.o \
-       monolib_brush.o \
-       monolib_clipbrd.o \
-       monolib_cursor.o \
-       monolib_data.o \
-       monolib_dc.o \
-       monolib_dcclient.o \
-       monolib_dcmemory.o \
-       monolib_dcscreen.o \
+       monolib_generic_timer.o \
+       monolib_mgl_app.o \
+       monolib_mgl_bitmap.o \
+       monolib_mgl_brush.o \
+       monolib_mgl_clipbrd.o \
+       monolib_mgl_cursor.o \
+       monolib_mgl_data.o \
+       monolib_mgl_dc.o \
+       monolib_mgl_dcclient.o \
+       monolib_mgl_dcmemory.o \
+       monolib_mgl_dcscreen.o \
         monolib_dirmgl.o \
         monolib_dirmgl.o \
-       monolib_evtloop.o \
-       monolib_font.o \
-       monolib_fontenum.o \
-       monolib_fontmgr.o \
-       monolib_fontutil.o \
-       monolib_palette.o \
-       monolib_pen.o \
-       monolib_region.o \
-       monolib_settings.o \
-       monolib_toplevel.o \
-       monolib_utils.o \
-       monolib_window.o
+       monolib_mgl_evtloop.o \
+       monolib_mgl_font.o \
+       monolib_mgl_fontenum.o \
+       monolib_mgl_fontmgr.o \
+       monolib_mgl_fontutil.o \
+       monolib_mgl_palette.o \
+       monolib_mgl_pen.o \
+       monolib_mgl_region.o \
+       monolib_mgl_settings.o \
+       monolib_mgl_toplevel.o \
+       monolib_mgl_utils.o \
+       monolib_mgl_window.o
  @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_2)
  COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_2 =  \
  @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_imaglist.o \
-       monolib_dialup.o \
-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_utilsx11.o \
+       monolib_generic_caret.o \
+       monolib_generic_imaglist.o \
+       monolib_unix_dialup.o \
         monolib_displayx11.o \
         monolib_displayx11.o \
-       monolib_bitmap.o \
-       monolib_brush.o \
-       monolib_palette.o \
-       monolib_pen.o \
-       monolib_region.o \
+       monolib_unix_fontenum.o \
+       monolib_unix_fontutil.o \
+       monolib_uiactionx11.o \
+       monolib_utilsx11.o \
+       monolib_x11_bitmap.o \
+       monolib_x11_brush.o \
+       monolib_x11_palette.o \
+       monolib_x11_pen.o \
+       monolib_x11_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_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_activex.o \
+       monolib_msw_app.o \
+       monolib_msw_bitmap.o \
+       monolib_msw_brush.o \
+       monolib_msw_caret.o \
+       monolib_msw_clipbrd.o \
+       monolib_msw_colour.o \
+       monolib_msw_cursor.o \
+       monolib_msw_data.o \
+       monolib_msw_dc.o \
+       monolib_msw_dcclient.o \
+       monolib_msw_dcmemory.o \
+       monolib_msw_dcprint.o \
+       monolib_msw_dcscreen.o \
+       monolib_msw_dialup.o \
         monolib_dib.o \
         monolib_dib.o \
-       monolib_display.o \
+       monolib_msw_display.o \
         monolib_enhmeta.o \
         monolib_enhmeta.o \
-       monolib_font.o \
-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_gdiimage.o \
-       monolib_gdiobj.o \
+       monolib_msw_font.o \
+       monolib_msw_fontenum.o \
+       monolib_msw_fontutil.o \
+       monolib_msw_gdiimage.o \
+       monolib_msw_gdiobj.o \
         monolib_gdiplus.o \
         monolib_gdiplus.o \
-       monolib_graphics.o \
-       monolib_icon.o \
-       monolib_imaglist.o \
-       monolib_minifram.o \
-       monolib_dataobj.o \
+       monolib_msw_graphics.o \
+       monolib_msw_icon.o \
+       monolib_msw_imaglist.o \
+       monolib_msw_minifram.o \
+       monolib_ole_dataobj.o \
         monolib_dropsrc.o \
         monolib_droptgt.o \
         monolib_oleutils.o \
         monolib_dropsrc.o \
         monolib_droptgt.o \
         monolib_oleutils.o \
-       monolib_palette.o \
-       monolib_pen.o \
-       monolib_popupwin.o \
-       monolib_printdlg.o \
+       monolib_msw_palette.o \
+       monolib_msw_pen.o \
+       monolib_msw_popupwin.o \
+       monolib_msw_printdlg.o \
         monolib_printwin.o \
         monolib_printwin.o \
-       monolib_region.o \
-       monolib_renderer.o \
-       monolib_settings.o \
-       monolib_tooltip.o \
-       monolib_toplevel.o \
-       monolib_utilsgui.o \
+       monolib_msw_region.o \
+       monolib_msw_renderer.o \
+       monolib_msw_settings.o \
+       monolib_msw_tooltip.o \
+       monolib_msw_toplevel.o \
+       monolib_uiaction.o \
+       monolib_msw_utilsgui.o \
         monolib_uxtheme.o \
         monolib_uxtheme.o \
-       monolib_window.o \
+       monolib_msw_window.o \
         monolib_helpchm.o \
         monolib_helpchm.o \
-       monolib_helpwin.o \
+       monolib_msw_helpwin.o \
         monolib_automtn.o \
         monolib_uuid.o
  @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2)
  @COND_TOOLKIT_OSX_CARBON@__LOWLEVEL_SRC_OBJECTS_2 \
         monolib_automtn.o \
         monolib_uuid.o
  @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2)
  @COND_TOOLKIT_OSX_CARBON@__LOWLEVEL_SRC_OBJECTS_2 \
-@COND_TOOLKIT_OSX_CARBON@      = $(__OSX_LOWLEVEL_SRC_OBJECTS_17)
+@COND_TOOLKIT_OSX_CARBON@      = $(__OSX_LOWLEVEL_SRC_OBJECTS_27)
  @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_2 = \
  @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_2 = \
-@COND_TOOLKIT_OSX_COCOA@       $(__OSX_LOWLEVEL_SRC_OBJECTS_17)
+@COND_TOOLKIT_OSX_COCOA@       $(__OSX_LOWLEVEL_SRC_OBJECTS_27)
+@COND_TOOLKIT_OSX_IPHONE@__LOWLEVEL_SRC_OBJECTS_2 \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__OSX_LOWLEVEL_SRC_OBJECTS_27)
  @COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_2 = 
  COND_TOOLKIT_WINCE___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_activex.o \
+       monolib_msw_app.o \
+       monolib_msw_bitmap.o \
+       monolib_msw_brush.o \
+       monolib_msw_caret.o \
+       monolib_msw_clipbrd.o \
+       monolib_msw_colour.o \
+       monolib_msw_cursor.o \
+       monolib_msw_data.o \
+       monolib_msw_dc.o \
+       monolib_msw_dcclient.o \
+       monolib_msw_dcmemory.o \
+       monolib_msw_dcprint.o \
+       monolib_msw_dcscreen.o \
+       monolib_msw_dialup.o \
         monolib_dib.o \
         monolib_dib.o \
-       monolib_display.o \
+       monolib_msw_display.o \
         monolib_enhmeta.o \
         monolib_enhmeta.o \
-       monolib_font.o \
-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_gdiimage.o \
-       monolib_gdiobj.o \
+       monolib_msw_font.o \
+       monolib_msw_fontenum.o \
+       monolib_msw_fontutil.o \
+       monolib_msw_gdiimage.o \
+       monolib_msw_gdiobj.o \
         monolib_gdiplus.o \
         monolib_gdiplus.o \
-       monolib_graphics.o \
-       monolib_icon.o \
-       monolib_imaglist.o \
-       monolib_minifram.o \
-       monolib_dataobj.o \
+       monolib_msw_graphics.o \
+       monolib_msw_icon.o \
+       monolib_msw_imaglist.o \
+       monolib_msw_minifram.o \
+       monolib_ole_dataobj.o \
         monolib_dropsrc.o \
         monolib_droptgt.o \
         monolib_oleutils.o \
         monolib_dropsrc.o \
         monolib_droptgt.o \
         monolib_oleutils.o \
-       monolib_palette.o \
-       monolib_pen.o \
-       monolib_popupwin.o \
-       monolib_printdlg.o \
+       monolib_msw_palette.o \
+       monolib_msw_pen.o \
+       monolib_msw_popupwin.o \
+       monolib_msw_printdlg.o \
         monolib_printwin.o \
         monolib_printwin.o \
-       monolib_region.o \
-       monolib_renderer.o \
-       monolib_settings.o \
-       monolib_tooltip.o \
-       monolib_toplevel.o \
-       monolib_utilsgui.o \
+       monolib_msw_region.o \
+       monolib_msw_renderer.o \
+       monolib_msw_settings.o \
+       monolib_msw_tooltip.o \
+       monolib_msw_toplevel.o \
+       monolib_uiaction.o \
+       monolib_msw_utilsgui.o \
         monolib_uxtheme.o \
         monolib_uxtheme.o \
-       monolib_window.o
+       monolib_msw_window.o
  @COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_2)
  COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_2 =  \
  @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_imaglist.o \
-       monolib_dialup.o \
-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_utilsx11.o \
+       monolib_generic_caret.o \
+       monolib_generic_imaglist.o \
+       monolib_unix_dialup.o \
         monolib_displayx11.o \
         monolib_displayx11.o \
-       monolib_icon.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_minifram.o \
+       monolib_unix_fontenum.o \
+       monolib_unix_fontutil.o \
+       monolib_uiactionx11.o \
+       monolib_utilsx11.o \
+       monolib_generic_icon.o \
+       monolib_generic_timer.o \
+       monolib_x11_app.o \
+       monolib_x11_bitmap.o \
+       monolib_x11_brush.o \
+       monolib_x11_clipbrd.o \
+       monolib_x11_colour.o \
+       monolib_x11_cursor.o \
+       monolib_x11_data.o \
+       monolib_x11_dataobj.o \
+       monolib_x11_dc.o \
+       monolib_x11_dcclient.o \
+       monolib_x11_dcmemory.o \
+       monolib_x11_dcscreen.o \
+       monolib_x11_evtloop.o \
+       monolib_x11_font.o \
+       monolib_x11_minifram.o \
         monolib_nanox.o \
         monolib_nanox.o \
-       monolib_palette.o \
-       monolib_pen.o \
-       monolib_popupwin.o \
-       monolib_region.o \
+       monolib_x11_palette.o \
+       monolib_x11_pen.o \
+       monolib_x11_popupwin.o \
+       monolib_x11_region.o \
         monolib_reparent.o \
         monolib_reparent.o \
-       monolib_settings.o \
-       monolib_toplevel.o \
-       monolib_utils.o \
+       monolib_x11_settings.o \
+       monolib_x11_toplevel.o \
+       monolib_x11_utils.o \
         monolib_utilsx.o \
         monolib_utilsx.o \
-       monolib_window.o
+       monolib_x11_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 \
  @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_2)
  COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 =  \
         monolib_NSBox.o \
@@ -6413,256 +7188,252 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 =  \
         monolib_NSView.o \
         monolib_NSWindow.o \
         monolib_ObjcRef.o \
         monolib_NSView.o \
         monolib_NSWindow.o \
         monolib_ObjcRef.o \
-       monolib_app.o \
-       monolib_bitmap.o \
-       monolib_bmpbuttn.o \
-       monolib_brush.o \
-       monolib_button.o \
-       monolib_checkbox.o \
-       monolib_checklst.o \
-       monolib_choice.o \
-       monolib_clipbrd.o \
-       monolib_colordlg.o \
-       monolib_colour.o \
-       monolib_combobox.o \
-       monolib_control.o \
-       monolib_cursor.o \
-       monolib_data.o \
-       monolib_dataobj.o \
-       monolib_dc.o \
-       monolib_dcclient.o \
-       monolib_dcmemory.o \
-       monolib_dcscreen.o \
-       monolib_dialog.o \
-       monolib_dirdlg.o \
-       monolib_display.o \
-       monolib_drawer.o \
-       monolib_evtloop.o \
-       monolib_filedlg.o \
-       monolib_font.o \
-       monolib_fontdlg.o \
-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_frame.o \
-       monolib_gauge.o \
-       monolib_icon.o \
-       monolib_listbox.o \
-       monolib_main.o \
+       monolib_cocoa_app.o \
+       monolib_cocoa_bitmap.o \
+       monolib_cocoa_bmpbuttn.o \
+       monolib_cocoa_brush.o \
+       monolib_src_cocoa_button.o \
+       monolib_src_cocoa_checkbox.o \
+       monolib_cocoa_checklst.o \
+       monolib_src_cocoa_choice.o \
+       monolib_cocoa_clipbrd.o \
+       monolib_cocoa_colordlg.o \
+       monolib_src_cocoa_colour.o \
+       monolib_src_cocoa_combobox.o \
+       monolib_cocoa_control.o \
+       monolib_cocoa_cursor.o \
+       monolib_cocoa_data.o \
+       monolib_cocoa_dataobj.o \
+       monolib_cocoa_dc.o \
+       monolib_cocoa_dcclient.o \
+       monolib_cocoa_dcmemory.o \
+       monolib_cocoa_dcscreen.o \
+       monolib_src_cocoa_dialog.o \
+       monolib_src_cocoa_dirdlg.o \
+       monolib_cocoa_display.o \
+       monolib_cocoa_drawer.o \
+       monolib_src_cocoa_evtloop.o \
+       monolib_src_cocoa_filedlg.o \
+       monolib_cocoa_font.o \
+       monolib_cocoa_fontdlg.o \
+       monolib_cocoa_fontenum.o \
+       monolib_cocoa_fontutil.o \
+       monolib_cocoa_frame.o \
+       monolib_src_cocoa_gauge.o \
+       monolib_cocoa_icon.o \
+       monolib_src_cocoa_listbox.o \
+       monolib_cocoa_main.o \
         monolib_mbarman.o \
         monolib_mbarman.o \
-       monolib_mdi.o \
-       monolib_menu.o \
-       monolib_menuitem.o \
-       monolib_msgdlg.o \
-       monolib_notebook.o \
-       monolib_pen.o \
-       monolib_radiobox.o \
-       monolib_radiobut.o \
-       monolib_region.o \
-       monolib_scrolbar.o \
-       monolib_settings.o \
-       monolib_slider.o \
-       monolib_sound.o \
-       monolib_spinbutt.o \
-       monolib_statbmp.o \
-       monolib_statbox.o \
+       monolib_cocoa_mdi.o \
+       monolib_src_cocoa_menu.o \
+       monolib_src_cocoa_menuitem.o \
+       monolib_src_cocoa_msgdlg.o \
+       monolib_src_cocoa_notebook.o \
+       monolib_cocoa_pen.o \
+       monolib_cocoa_radiobox.o \
+       monolib_src_cocoa_radiobut.o \
+       monolib_cocoa_region.o \
+       monolib_src_cocoa_scrolbar.o \
+       monolib_cocoa_settings.o \
+       monolib_src_cocoa_slider.o \
+       monolib_cocoa_sound.o \
+       monolib_src_cocoa_spinbutt.o \
+       monolib_cocoa_statbmp.o \
+       monolib_src_cocoa_statbox.o \
         monolib_statline2.o \
         monolib_statline2.o \
-       monolib_stattext.o \
-       monolib_textctrl.o \
-       monolib_timer.o \
-       monolib_toolbar.o \
-       monolib_tooltip.o \
-       monolib_toplevel.o \
-       monolib_utils.o \
-       monolib_utilsexc.o \
-       monolib_window.o \
-       monolib_accel.o \
-       monolib_caret.o \
+       monolib_src_cocoa_stattext.o \
+       monolib_src_cocoa_textctrl.o \
+       monolib_cocoa_timer.o \
+       monolib_src_cocoa_toolbar.o \
+       monolib_src_cocoa_tooltip.o \
+       monolib_cocoa_toplevel.o \
+       monolib_src_cocoa_utils.o \
+       monolib_cocoa_utilsexc.o \
+       monolib_src_cocoa_window.o \
+       monolib_generic_accel.o \
+       monolib_generic_caret.o \
         monolib_clrpickerg.o \
         monolib_collpaneg.o \
         monolib_colrdlgg.o \
         monolib_clrpickerg.o \
         monolib_collpaneg.o \
         monolib_colrdlgg.o \
-       monolib_fdrepdlg.o \
+       monolib_generic_fdrepdlg.o \
         monolib_filepickerg.o \
         monolib_fontdlgg.o \
         monolib_fontpickerg.o \
         monolib_filepickerg.o \
         monolib_fontdlgg.o \
         monolib_fontpickerg.o \
-       monolib_imaglist.o \
-       monolib_listctrl.o \
-       monolib_msgdlgg.o \
+       monolib_generic_imaglist.o \
+       monolib_generic_listctrl.o \
         monolib_paletteg.o \
         monolib_regiong.o \
         monolib_paletteg.o \
         monolib_regiong.o \
-       monolib_statusbr.o \
-       monolib_tabg.o
+       monolib_generic_statusbr.o
  @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_1 =  \
  @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_1 =  \
-       monolib_accel.o \
+       monolib_generic_accel.o \
         monolib_clrpickerg.o \
         monolib_collpaneg.o \
         monolib_colrdlgg.o \
         monolib_dirdlgg.o \
         monolib_clrpickerg.o \
         monolib_collpaneg.o \
         monolib_colrdlgg.o \
         monolib_dirdlgg.o \
-       monolib_fdrepdlg.o \
+       monolib_generic_fdrepdlg.o \
         monolib_filedlgg.o \
         monolib_filepickerg.o \
         monolib_fontdlgg.o \
         monolib_fontpickerg.o \
         monolib_filedlgg.o \
         monolib_filepickerg.o \
         monolib_fontdlgg.o \
         monolib_fontpickerg.o \
-       monolib_listctrl.o \
-       monolib_msgdlgg.o \
+       monolib_generic_listctrl.o \
         monolib_prntdlgg.o \
         monolib_prntdlgg.o \
-       monolib_statusbr.o \
-       monolib_tabg.o \
-       monolib_bmpbuttn.o \
-       monolib_button.o \
-       monolib_checkbox.o \
-       monolib_checklst.o \
-       monolib_choice.o \
-       monolib_combobox.o \
-       monolib_control.o \
-       monolib_dialog.o \
-       monolib_filedlg.o \
-       monolib_fontdlg.o \
-       monolib_frame.o \
-       monolib_gauge.o \
-       monolib_listbox.o \
-       monolib_mdi.o \
-       monolib_menu.o \
-       monolib_notebook.o \
-       monolib_radiobox.o \
-       monolib_radiobut.o \
-       monolib_scrolbar.o \
-       monolib_scrolwin.o \
-       monolib_slider.o \
-       monolib_spinbutt.o \
-       monolib_spinctrl.o \
-       monolib_statbmp.o \
-       monolib_statbox.o \
-       monolib_statline.o \
-       monolib_stattext.o \
-       monolib_tbargtk.o \
-       monolib_textctrl.o \
-       monolib_tglbtn.o
+       monolib_generic_statusbr.o \
+       monolib_gtk1_bmpbuttn.o \
+       monolib_gtk1_button.o \
+       monolib_gtk1_checkbox.o \
+       monolib_gtk1_checklst.o \
+       monolib_gtk1_choice.o \
+       monolib_gtk1_combobox.o \
+       monolib_gtk1_control.o \
+       monolib_gtk1_dialog.o \
+       monolib_gtk1_filedlg.o \
+       monolib_gtk1_fontdlg.o \
+       monolib_gtk1_frame.o \
+       monolib_gtk1_gauge.o \
+       monolib_gtk1_listbox.o \
+       monolib_gtk1_mdi.o \
+       monolib_gtk1_menu.o \
+       monolib_gtk1_mnemonics.o \
+       monolib_gtk1_notebook.o \
+       monolib_gtk1_radiobox.o \
+       monolib_gtk1_radiobut.o \
+       monolib_gtk1_scrolbar.o \
+       monolib_gtk1_scrolwin.o \
+       monolib_gtk1_slider.o \
+       monolib_gtk1_spinbutt.o \
+       monolib_gtk1_spinctrl.o \
+       monolib_gtk1_statbmp.o \
+       monolib_gtk1_statbox.o \
+       monolib_gtk1_statline.o \
+       monolib_gtk1_stattext.o \
+       monolib_gtk1_toolbar.o \
+       monolib_gtk1_textctrl.o \
+       monolib_gtk1_tglbtn.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_1)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1 =  \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_1)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1 =  \
-       monolib_accel.o \
-       monolib_fdrepdlg.o \
+       monolib_generic_accel.o \
+       monolib_generic_fdrepdlg.o \
         monolib_filepickerg.o \
         monolib_filepickerg.o \
-       monolib_graphicc.o \
-       monolib_listctrl.o \
+       monolib_generic_listctrl.o \
         monolib_prntdlgg.o \
         monolib_prntdlgg.o \
-       monolib_statusbr.o \
-       monolib_tabg.o \
+       monolib_generic_statusbr.o \
         monolib_fontdlgg.o \
         monolib_fontdlgg.o \
-       monolib_msgdlgg.o \
+       monolib_gtk_anybutton.o \
         monolib_artgtk.o \
         monolib_artgtk.o \
-       monolib_bmpbuttn.o \
-       monolib_button.o \
-       monolib_checkbox.o \
-       monolib_checklst.o \
-       monolib_choice.o \
+       monolib_gtk_bmpbuttn.o \
+       monolib_gtk_button.o \
+       monolib_gtk_checkbox.o \
+       monolib_gtk_checklst.o \
+       monolib_gtk_choice.o \
         monolib_collpane.o \
         monolib_collpane.o \
-       monolib_colordlg.o \
-       monolib_combobox.o \
-       monolib_control.o \
+       monolib_gtk_colordlg.o \
+       monolib_gtk_combobox.o \
+       monolib_gtk_control.o \
         monolib_clrpicker.o \
         monolib_clrpicker.o \
-       monolib_dialog.o \
+       monolib_gtk_dialog.o \
         monolib_fontpicker.o \
         monolib_filepicker.o \
         monolib_fontpicker.o \
         monolib_filepicker.o \
-       monolib_dirdlg.o \
-       monolib_filedlg.o \
-       monolib_fontdlg.o \
-       monolib_frame.o \
-       monolib_gauge.o \
+       monolib_gtk_dirdlg.o \
+       monolib_gtk_filedlg.o \
+       monolib_gtk_fontdlg.o \
+       monolib_gtk_frame.o \
+       monolib_gtk_gauge.o \
         monolib_gprint.o \
         monolib_gvfs.o \
         monolib_gprint.o \
         monolib_gvfs.o \
-       monolib_print.o \
-       monolib_listbox.o \
-       monolib_mdi.o \
-       monolib_menu.o \
-       monolib_mnemonics.o \
-       monolib_msgdlg.o \
-       monolib_nativewin.o \
-       monolib_notebook.o \
-       monolib_radiobox.o \
-       monolib_radiobut.o \
-       monolib_scrolbar.o \
-       monolib_scrolwin.o \
-       monolib_slider.o \
-       monolib_spinbutt.o \
-       monolib_spinctrl.o \
-       monolib_statbmp.o \
-       monolib_statbox.o \
-       monolib_statline.o \
-       monolib_stattext.o \
-       monolib_tbargtk.o \
-       monolib_textctrl.o \
-       monolib_textentry.o \
-       monolib_tglbtn.o \
+       monolib_gtk_infobar.o \
+       monolib_gtk_listbox.o \
+       monolib_gtk_mdi.o \
+       monolib_gtk_menu.o \
+       monolib_gtk_mnemonics.o \
+       monolib_gtk_msgdlg.o \
+       monolib_gtk_nativewin.o \
+       monolib_gtk_notebook.o \
+       monolib_gtk_print.o \
+       monolib_gtk_radiobox.o \
+       monolib_gtk_radiobut.o \
+       monolib_gtk_scrolbar.o \
+       monolib_gtk_scrolwin.o \
+       monolib_gtk_slider.o \
+       monolib_gtk_spinbutt.o \
+       monolib_gtk_spinctrl.o \
+       monolib_gtk_statbmp.o \
+       monolib_gtk_statbox.o \
+       monolib_gtk_statline.o \
+       monolib_gtk_stattext.o \
+       monolib_gtk_toolbar.o \
+       monolib_gtk_textctrl.o \
+       monolib_gtk_textentry.o \
+       monolib_gtk_tglbtn.o \
         monolib_treeentry_gtk.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1)
  COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 =  \
         monolib_treeentry_gtk.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1)
  COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 =  \
-       monolib_accel.o \
-       monolib_app.o \
-       monolib_bmpbuttn.o \
+       monolib_motif_accel.o \
+       monolib_motif_app.o \
+       monolib_motif_bmpbuttn.o \
         monolib_bmpmotif.o \
         monolib_bmpmotif.o \
-       monolib_button.o \
-       monolib_checkbox.o \
-       monolib_checklst.o \
-       monolib_choice.o \
-       monolib_clipbrd.o \
-       monolib_colour.o \
-       monolib_combobox.o \
+       monolib_motif_button.o \
+       monolib_motif_checkbox.o \
+       monolib_motif_checklst.o \
+       monolib_motif_choice.o \
+       monolib_motif_clipbrd.o \
+       monolib_motif_colour.o \
+       monolib_motif_combobox.o \
         monolib_combobox_native.o \
         monolib_combobox_native.o \
-       monolib_control.o \
-       monolib_cursor.o \
-       monolib_data.o \
-       monolib_dataobj.o \
-       monolib_dc.o \
-       monolib_dcclient.o \
-       monolib_dcmemory.o \
-       monolib_dcscreen.o \
-       monolib_dialog.o \
-       monolib_evtloop.o \
-       monolib_filedlg.o \
-       monolib_font.o \
-       monolib_frame.o \
-       monolib_gauge.o \
-       monolib_gsockmot.o \
-       monolib_icon.o \
-       monolib_listbox.o \
-       monolib_main.o \
-       monolib_mdi.o \
-       monolib_menu.o \
-       monolib_menuitem.o \
-       monolib_minifram.o \
-       monolib_msgdlg.o \
-       monolib_popupwin.o \
-       monolib_radiobox.o \
-       monolib_radiobut.o \
-       monolib_scrolbar.o \
-       monolib_settings.o \
-       monolib_slider.o \
-       monolib_spinbutt.o \
-       monolib_statbmp.o \
-       monolib_statbox.o \
-       monolib_stattext.o \
-       monolib_textctrl.o \
-       monolib_textentry.o \
-       monolib_timer.o \
-       monolib_toolbar.o \
-       monolib_toplevel.o \
-       monolib_utils.o \
-       monolib_window.o \
+       monolib_motif_control.o \
+       monolib_motif_cursor.o \
+       monolib_motif_data.o \
+       monolib_motif_dataobj.o \
+       monolib_motif_dc.o \
+       monolib_motif_dcclient.o \
+       monolib_motif_dcmemory.o \
+       monolib_motif_dcscreen.o \
+       monolib_motif_dialog.o \
+       monolib_motif_evtloop.o \
+       monolib_motif_filedlg.o \
+       monolib_motif_font.o \
+       monolib_motif_frame.o \
+       monolib_motif_gauge.o \
+       monolib_sockmot.o \
+       monolib_motif_icon.o \
+       monolib_motif_listbox.o \
+       monolib_motif_main.o \
+       monolib_motif_menu.o \
+       monolib_motif_menuitem.o \
+       monolib_motif_minifram.o \
+       monolib_motif_msgdlg.o \
+       monolib_motif_popupwin.o \
+       monolib_motif_radiobox.o \
+       monolib_motif_radiobut.o \
+       monolib_motif_scrolbar.o \
+       monolib_motif_settings.o \
+       monolib_motif_slider.o \
+       monolib_motif_spinbutt.o \
+       monolib_motif_statbmp.o \
+       monolib_motif_statbox.o \
+       monolib_motif_stattext.o \
+       monolib_motif_textctrl.o \
+       monolib_motif_textentry.o \
+       monolib_motif_timer.o \
+       monolib_motif_toolbar.o \
+       monolib_motif_toplevel.o \
+       monolib_motif_utils.o \
+       monolib_motif_window.o \
         monolib_xmcombo.o \
         monolib_clrpickerg.o \
         monolib_collpaneg.o \
         monolib_colrdlgg.o \
         monolib_dirdlgg.o \
         monolib_xmcombo.o \
         monolib_clrpickerg.o \
         monolib_collpaneg.o \
         monolib_colrdlgg.o \
         monolib_dirdlgg.o \
-       monolib_fdrepdlg.o \
+       monolib_generic_fdrepdlg.o \
         monolib_filepickerg.o \
         monolib_fontdlgg.o \
         monolib_fontpickerg.o \
         monolib_filepickerg.o \
         monolib_fontdlgg.o \
         monolib_fontpickerg.o \
-       monolib_listctrl.o \
-       monolib_notebook.o \
+       monolib_generic_listctrl.o \
+       monolib_mdig.o \
+       monolib_generic_notebook.o \
         monolib_prntdlgg.o \
         monolib_prntdlgg.o \
-       monolib_statline.o \
-       monolib_statusbr.o \
+       monolib_generic_statline.o \
+       monolib_generic_statusbr.o \
         monolib_tabg.o
  @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1)
  COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 =  \
         monolib_tabg.o
  @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1)
  COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 =  \
@@ -6670,291 +7441,302 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 =  \
         monolib_collpaneg.o \
         monolib_filepickerg.o \
         monolib_fontpickerg.o \
         monolib_collpaneg.o \
         monolib_filepickerg.o \
         monolib_fontpickerg.o \
-       monolib_statusbr.o \
+       monolib_generic_statusbr.o \
         monolib_prntdlgg.o \
         monolib_prntdlgg.o \
-       monolib_accel.o \
-       monolib_bmpbuttn.o \
-       monolib_button.o \
-       monolib_checkbox.o \
-       monolib_choice.o \
-       monolib_colordlg.o \
+       monolib_msw_accel.o \
+       monolib_msw_anybutton.o \
+       monolib_artmsw.o \
+       monolib_msw_bmpbuttn.o \
+       monolib_msw_button.o \
+       monolib_msw_checkbox.o \
+       monolib_msw_choice.o \
+       monolib_msw_colordlg.o \
         monolib_combo.o \
         monolib_combo.o \
-       monolib_combobox.o \
-       monolib_control.o \
-       monolib_dialog.o \
-       monolib_dirdlg.o \
+       monolib_msw_combobox.o \
+       monolib_msw_control.o \
+       monolib_msw_dialog.o \
+       monolib_msw_dirdlg.o \
         monolib_dragimag.o \
         monolib_dragimag.o \
-       monolib_filedlg.o \
-       monolib_frame.o \
-       monolib_gauge.o \
-       monolib_iniconf.o \
-       monolib_listbox.o \
-       monolib_listctrl.o \
-       monolib_mdi.o \
-       monolib_menu.o \
-       monolib_menuitem.o \
-       monolib_metafile.o \
-       monolib_msgdlg.o \
-       monolib_nativdlg.o \
-       monolib_nativewin.o \
-       monolib_notebook.o \
+       monolib_msw_filedlg.o \
+       monolib_msw_frame.o \
+       monolib_msw_gauge.o \
+       monolib_headerctrl.o \
+       monolib_msw_iniconf.o \
+       monolib_msw_listbox.o \
+       monolib_msw_listctrl.o \
+       monolib_msw_mdi.o \
+       monolib_msw_menu.o \
+       monolib_msw_menuitem.o \
+       monolib_msw_metafile.o \
+       monolib_msw_msgdlg.o \
+       monolib_msw_nativdlg.o \
+       monolib_msw_nativewin.o \
+       monolib_msw_notebook.o \
         monolib_access.o \
         monolib_access.o \
-       monolib_ownerdrw.o \
-       monolib_radiobox.o \
-       monolib_radiobut.o \
-       monolib_scrolbar.o \
-       monolib_slider.o \
-       monolib_spinbutt.o \
-       monolib_spinctrl.o \
-       monolib_statbmp.o \
-       monolib_statbox.o \
+       monolib_msw_ownerdrw.o \
+       monolib_msw_panel.o \
+       monolib_progdlg.o \
+       monolib_msw_radiobox.o \
+       monolib_msw_radiobut.o \
+       monolib_richmsgdlg.o \
+       monolib_msw_scrolbar.o \
+       monolib_msw_slider.o \
+       monolib_msw_spinbutt.o \
+       monolib_msw_spinctrl.o \
+       monolib_msw_statbmp.o \
+       monolib_msw_statbox.o \
         monolib_statusbar.o \
         monolib_statusbar.o \
-       monolib_statline.o \
-       monolib_stattext.o \
-       monolib_tabctrl.o \
-       monolib_toolbar.o \
-       monolib_textctrl.o \
-       monolib_textentry.o \
-       monolib_tglbtn.o \
+       monolib_msw_statline.o \
+       monolib_msw_stattext.o \
+       monolib_msw_toolbar.o \
+       monolib_msw_textctrl.o \
+       monolib_msw_textentry.o \
+       monolib_msw_tglbtn.o \
         monolib_treectrl.o \
         monolib_treectrl.o \
-       monolib_checklst.o \
-       monolib_fdrepdlg.o \
-       monolib_fontdlg.o
+       monolib_msw_checklst.o \
+       monolib_msw_fdrepdlg.o \
+       monolib_msw_fontdlg.o
  @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1)
  COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_1 =  \
  @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1)
  COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_1 =  \
-       $(__OSX_CARBON_COCOA_SRC_OBJECTS_0) \
-       monolib_bmpbuttn.o \
-       monolib_button.o \
-       monolib_checkbox.o \
-       monolib_choice.o \
-       monolib_colordlg.o \
-       monolib_dialog.o \
-       monolib_dirdlg.o \
-       monolib_evtloop.o \
-       monolib_filedlg.o \
-       monolib_gauge.o \
-       monolib_listbox.o \
+       $(__OSX_CARBON_COCOA_SRC_OBJECTS_12) \
+       monolib_carbon_anybutton.o \
+       monolib_carbon_bmpbuttn.o \
+       monolib_carbon_button.o \
+       monolib_carbon_checkbox.o \
+       monolib_carbon_choice.o \
+       monolib_carbon_colordlg.o \
+       monolib_carbon_dialog.o \
+       monolib_carbon_dirdlg.o \
+       monolib_carbon_dnd.o \
+       monolib_carbon_evtloop.o \
+       monolib_carbon_filedlg.o \
+       monolib_carbon_gauge.o \
+       monolib_carbon_listbox.o \
         monolib_listctrl_mac.o \
         monolib_listctrl_mac.o \
-       monolib_mdi.o \
-       monolib_menu.o \
-       monolib_menuitem.o \
-       monolib_msgdlg.o \
-       monolib_nonownedwnd.o \
+       monolib_carbon_menu.o \
+       monolib_carbon_menuitem.o \
+       monolib_carbon_msgdlg.o \
+       monolib_carbon_nonownedwnd.o \
         monolib_notebmac.o \
         monolib_notebmac.o \
-       monolib_radiobut.o \
-       monolib_region.o \
-       monolib_scrolbar.o \
-       monolib_slider.o \
-       monolib_spinbutt.o \
-       monolib_srchctrl.o \
-       monolib_statbmp.o \
-       monolib_statbox.o \
+       monolib_carbon_printdlg.o \
+       monolib_carbon_radiobut.o \
+       monolib_carbon_scrolbar.o \
+       monolib_carbon_slider.o \
+       monolib_carbon_spinbutt.o \
+       monolib_carbon_srchctrl.o \
+       monolib_carbon_statbmp.o \
+       monolib_carbon_statbox.o \
         monolib_statlmac.o \
         monolib_statlmac.o \
-       monolib_stattext.o \
-       monolib_textctrl.o \
-       monolib_tglbtn.o \
-       monolib_toolbar.o \
-       monolib_window.o \
-       monolib_webkit.o \
-       monolib_caret.o \
-       monolib_clrpickerg.o \
-       monolib_collpaneg.o \
-       monolib_fdrepdlg.o \
-       monolib_filepickerg.o \
-       monolib_fontdlgg.o \
-       monolib_fontpickerg.o \
-       monolib_listctrl.o \
-       monolib_prntdlgg.o \
-       monolib_statusbr.o \
-       monolib_tabg.o
+       monolib_carbon_stattext.o \
+       monolib_carbon_textctrl.o \
+       monolib_carbon_tglbtn.o \
+       monolib_carbon_toolbar.o \
+       monolib_carbon_tooltip.o \
+       monolib_carbon_window.o
  @COND_TOOLKIT_OSX_CARBON@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_1)
  COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_1 =  \
  @COND_TOOLKIT_OSX_CARBON@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_1)
  COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_1 =  \
-       $(__OSX_CARBON_COCOA_SRC_OBJECTS_0) \
-       monolib_bmpbuttn.o \
-       monolib_button.o \
-       monolib_checkbox.o \
-       monolib_choice.o \
-       monolib_dialog.o \
-       monolib_dirdlg.o \
-       monolib_evtloop.o \
-       monolib_filedlg.o \
-       monolib_gauge.o \
-       monolib_glcanvas.o \
-       monolib_listbox.o \
-       monolib_menu.o \
-       monolib_menuitem.o \
-       monolib_msgdlg.o \
-       monolib_nonownedwnd.o \
-       monolib_notebook.o \
-       monolib_radiobut.o \
-       monolib_scrolbar.o \
-       monolib_slider.o \
-       monolib_spinbutt.o \
-       monolib_srchctrl.o \
-       monolib_statbox.o \
-       monolib_statline.o \
-       monolib_stattext.o \
-       monolib_textctrl.o \
-       monolib_tglbtn.o \
-       monolib_toolbar.o \
-       monolib_window.o \
-       monolib_caret.o \
-       monolib_clrpickerg.o \
-       monolib_collpaneg.o \
-       monolib_fdrepdlg.o \
-       monolib_filepickerg.o \
-       monolib_fontdlgg.o \
-       monolib_fontpickerg.o \
-       monolib_listctrl.o \
-       monolib_prntdlgg.o \
-       monolib_regiong.o \
-       monolib_statusbr.o \
-       monolib_tabg.o
+       $(__OSX_CARBON_COCOA_SRC_OBJECTS_12) \
+       monolib_cocoa_anybutton.o \
+       monolib_osx_cocoa_button.o \
+       monolib_osx_cocoa_checkbox.o \
+       monolib_osx_cocoa_choice.o \
+       monolib_osx_cocoa_colour.o \
+       monolib_osx_cocoa_combobox.o \
+       monolib_osx_cocoa_dialog.o \
+       monolib_osx_cocoa_dirdlg.o \
+       monolib_cocoa_dnd.o \
+       monolib_osx_cocoa_evtloop.o \
+       monolib_osx_cocoa_filedlg.o \
+       monolib_osx_cocoa_gauge.o \
+       monolib_osx_cocoa_listbox.o \
+       monolib_osx_cocoa_menu.o \
+       monolib_osx_cocoa_menuitem.o \
+       monolib_osx_cocoa_msgdlg.o \
+       monolib_cocoa_nonownedwnd.o \
+       monolib_osx_cocoa_notebook.o \
+       monolib_osx_cocoa_radiobut.o \
+       monolib_cocoa_printdlg.o \
+       monolib_osx_cocoa_scrolbar.o \
+       monolib_osx_cocoa_slider.o \
+       monolib_osx_cocoa_spinbutt.o \
+       monolib_cocoa_srchctrl.o \
+       monolib_osx_cocoa_statbox.o \
+       monolib_cocoa_statline.o \
+       monolib_osx_cocoa_stattext.o \
+       monolib_osx_cocoa_textctrl.o \
+       monolib_cocoa_tglbtn.o \
+       monolib_osx_cocoa_toolbar.o \
+       monolib_osx_cocoa_tooltip.o \
+       monolib_osx_cocoa_window.o
  @COND_TOOLKIT_OSX_COCOA@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_1)
  @COND_TOOLKIT_OSX_COCOA@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_1)
+COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_1 =  \
+       $(__OSX_CARBON_COCOA_SRC_OBJECTS_12) \
+       monolib_regiong.o \
+       monolib_generic_icon.o \
+       monolib_iphone_anybutton.o \
+       monolib_iphone_button.o \
+       monolib_iphone_checkbox.o \
+       monolib_iphone_dialog.o \
+       monolib_iphone_evtloop.o \
+       monolib_iphone_gauge.o \
+       monolib_iphone_msgdlg.o \
+       monolib_iphone_nonownedwnd.o \
+       monolib_iphone_scrolbar.o \
+       monolib_iphone_slider.o \
+       monolib_iphone_stattext.o \
+       monolib_iphone_textctrl.o \
+       monolib_iphone_toolbar.o \
+       monolib_iphone_utils.o \
+       monolib_iphone_window.o
+@COND_TOOLKIT_OSX_IPHONE@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_1)
  COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1 =  \
  COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1 =  \
-       monolib_caret.o \
+       monolib_generic_caret.o \
         monolib_clrpickerg.o \
         monolib_collpaneg.o \
         monolib_colrdlgg.o \
         monolib_dirdlgg.o \
         monolib_clrpickerg.o \
         monolib_collpaneg.o \
         monolib_colrdlgg.o \
         monolib_dirdlgg.o \
-       monolib_fdrepdlg.o \
+       monolib_generic_fdrepdlg.o \
         monolib_filepickerg.o \
         monolib_fontpickerg.o \
         monolib_filepickerg.o \
         monolib_fontpickerg.o \
-       monolib_imaglist.o \
-       monolib_listctrl.o \
+       monolib_generic_imaglist.o \
+       monolib_generic_listctrl.o \
         monolib_mdig.o \
         monolib_prntdlgg.o \
         monolib_mdig.o \
         monolib_prntdlgg.o \
-       monolib_statusbr.o \
-       monolib_accel.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_colour.o \
-       monolib_combobox.o \
-       monolib_control.o \
-       monolib_cursor.o \
-       monolib_data.o \
-       monolib_dataobj.o \
-       monolib_dc.o \
-       monolib_dcclient.o \
-       monolib_dcmemory.o \
-       monolib_dcprint.o \
-       monolib_dcscreen.o \
-       monolib_dialog.o \
-       monolib_dnd.o \
-       monolib_evtloop.o \
-       monolib_filedlg.o \
-       monolib_font.o \
-       monolib_fontdlg.o \
-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_frame.o \
-       monolib_gauge.o \
-       monolib_gdiimage.o \
-       monolib_gsockpm.o \
-       monolib_helpwin.o \
-       monolib_icon.o \
-       monolib_iniconf.o \
-       monolib_listbox.o \
-       monolib_main.o \
-       monolib_menu.o \
-       monolib_menuitem.o \
-       monolib_metafile.o \
-       monolib_minifram.o \
-       monolib_msgdlg.o \
-       monolib_nativdlg.o \
-       monolib_notebook.o \
-       monolib_ownerdrw.o \
-       monolib_palette.o \
-       monolib_pen.o \
-       monolib_popupwin.o \
-       monolib_print.o \
-       monolib_radiobox.o \
-       monolib_radiobut.o \
-       monolib_region.o \
-       monolib_scrolbar.o \
-       monolib_settings.o \
-       monolib_slider.o \
-       monolib_spinbutt.o \
-       monolib_spinctrl.o \
-       monolib_statbmp.o \
-       monolib_statbox.o \
-       monolib_statline.o \
-       monolib_stattext.o \
-       monolib_tabctrl.o \
-       monolib_textctrl.o \
-       monolib_textentry.o \
-       monolib_tglbtn.o \
-       monolib_timer.o \
-       monolib_toolbar.o \
-       monolib_tooltip.o \
-       monolib_toplevel.o \
-       monolib_utilsgui.o \
-       monolib_window.o
+       monolib_generic_statusbr.o \
+       monolib_os2_accel.o \
+       monolib_os2_app.o \
+       monolib_os2_bitmap.o \
+       monolib_os2_bmpbuttn.o \
+       monolib_os2_brush.o \
+       monolib_os2_button.o \
+       monolib_os2_checkbox.o \
+       monolib_os2_checklst.o \
+       monolib_os2_choice.o \
+       monolib_os2_clipbrd.o \
+       monolib_os2_colour.o \
+       monolib_os2_combobox.o \
+       monolib_os2_control.o \
+       monolib_os2_cursor.o \
+       monolib_os2_data.o \
+       monolib_os2_dataobj.o \
+       monolib_os2_dc.o \
+       monolib_os2_dcclient.o \
+       monolib_os2_dcmemory.o \
+       monolib_os2_dcprint.o \
+       monolib_os2_dcscreen.o \
+       monolib_os2_dialog.o \
+       monolib_os2_dnd.o \
+       monolib_os2_evtloop.o \
+       monolib_os2_filedlg.o \
+       monolib_os2_font.o \
+       monolib_os2_fontdlg.o \
+       monolib_os2_fontenum.o \
+       monolib_os2_fontutil.o \
+       monolib_os2_frame.o \
+       monolib_os2_gauge.o \
+       monolib_os2_gdiimage.o \
+       monolib_sockpm.o \
+       monolib_os2_helpwin.o \
+       monolib_os2_icon.o \
+       monolib_os2_iniconf.o \
+       monolib_os2_listbox.o \
+       monolib_os2_main.o \
+       monolib_os2_menu.o \
+       monolib_os2_menuitem.o \
+       monolib_os2_metafile.o \
+       monolib_os2_minifram.o \
+       monolib_os2_msgdlg.o \
+       monolib_os2_nativdlg.o \
+       monolib_os2_notebook.o \
+       monolib_os2_ownerdrw.o \
+       monolib_os2_palette.o \
+       monolib_os2_pen.o \
+       monolib_os2_popupwin.o \
+       monolib_os2_print.o \
+       monolib_os2_radiobox.o \
+       monolib_os2_radiobut.o \
+       monolib_os2_region.o \
+       monolib_os2_scrolbar.o \
+       monolib_os2_settings.o \
+       monolib_os2_slider.o \
+       monolib_os2_spinbutt.o \
+       monolib_os2_spinctrl.o \
+       monolib_os2_statbmp.o \
+       monolib_os2_statbox.o \
+       monolib_os2_statline.o \
+       monolib_os2_stattext.o \
+       monolib_os2_textctrl.o \
+       monolib_os2_textentry.o \
+       monolib_os2_tglbtn.o \
+       monolib_os2_timer.o \
+       monolib_os2_toolbar.o \
+       monolib_os2_tooltip.o \
+       monolib_os2_toplevel.o \
+       monolib_os2_utilsgui.o \
+       monolib_os2_window.o
  @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1)
  COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 =  \
         monolib_clrpickerg.o \
         monolib_collpaneg.o \
         monolib_filepickerg.o \
         monolib_fontpickerg.o \
  @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1)
  COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 =  \
         monolib_clrpickerg.o \
         monolib_collpaneg.o \
         monolib_filepickerg.o \
         monolib_fontpickerg.o \
-       monolib_statusbr.o \
+       monolib_generic_statusbr.o \
         monolib_prntdlgg.o \
         monolib_prntdlgg.o \
-       monolib_accel.o \
-       monolib_bmpbuttn.o \
-       monolib_button.o \
-       monolib_checkbox.o \
-       monolib_choice.o \
-       monolib_colordlg.o \
+       monolib_msw_accel.o \
+       monolib_msw_anybutton.o \
+       monolib_artmsw.o \
+       monolib_msw_bmpbuttn.o \
+       monolib_msw_button.o \
+       monolib_msw_checkbox.o \
+       monolib_msw_choice.o \
+       monolib_msw_colordlg.o \
         monolib_combo.o \
         monolib_combo.o \
-       monolib_combobox.o \
-       monolib_control.o \
-       monolib_dialog.o \
-       monolib_dirdlg.o \
+       monolib_msw_combobox.o \
+       monolib_msw_control.o \
+       monolib_msw_dialog.o \
+       monolib_msw_dirdlg.o \
         monolib_dragimag.o \
         monolib_dragimag.o \
-       monolib_filedlg.o \
-       monolib_frame.o \
-       monolib_gauge.o \
-       monolib_iniconf.o \
-       monolib_listbox.o \
-       monolib_listctrl.o \
-       monolib_mdi.o \
-       monolib_menu.o \
-       monolib_menuitem.o \
-       monolib_metafile.o \
-       monolib_msgdlg.o \
-       monolib_nativdlg.o \
-       monolib_nativewin.o \
-       monolib_notebook.o \
+       monolib_msw_filedlg.o \
+       monolib_msw_frame.o \
+       monolib_msw_gauge.o \
+       monolib_headerctrl.o \
+       monolib_msw_iniconf.o \
+       monolib_msw_listbox.o \
+       monolib_msw_listctrl.o \
+       monolib_msw_mdi.o \
+       monolib_msw_menu.o \
+       monolib_msw_menuitem.o \
+       monolib_msw_metafile.o \
+       monolib_msw_msgdlg.o \
+       monolib_msw_nativdlg.o \
+       monolib_msw_nativewin.o \
+       monolib_msw_notebook.o \
         monolib_access.o \
         monolib_access.o \
-       monolib_ownerdrw.o \
-       monolib_radiobox.o \
-       monolib_radiobut.o \
-       monolib_scrolbar.o \
-       monolib_slider.o \
-       monolib_spinbutt.o \
-       monolib_spinctrl.o \
-       monolib_statbmp.o \
-       monolib_statbox.o \
+       monolib_msw_ownerdrw.o \
+       monolib_msw_panel.o \
+       monolib_progdlg.o \
+       monolib_msw_radiobox.o \
+       monolib_msw_radiobut.o \
+       monolib_richmsgdlg.o \
+       monolib_msw_scrolbar.o \
+       monolib_msw_slider.o \
+       monolib_msw_spinbutt.o \
+       monolib_msw_spinctrl.o \
+       monolib_msw_statbmp.o \
+       monolib_msw_statbox.o \
         monolib_statusbar.o \
         monolib_statusbar.o \
-       monolib_statline.o \
-       monolib_stattext.o \
-       monolib_tabctrl.o \
-       monolib_toolbar.o \
-       monolib_textctrl.o \
-       monolib_textentry.o \
-       monolib_tglbtn.o \
+       monolib_msw_statline.o \
+       monolib_msw_stattext.o \
+       monolib_msw_toolbar.o \
+       monolib_msw_textctrl.o \
+       monolib_msw_textentry.o \
+       monolib_msw_tglbtn.o \
         monolib_treectrl.o \
         monolib_dirdlgg.o \
         monolib_treectrl.o \
         monolib_dirdlgg.o \
-       monolib_fdrepdlg.o \
+       monolib_generic_fdrepdlg.o \
         monolib_filedlgg.o \
         monolib_fontdlgg.o \
         monolib_filedlgg.o \
         monolib_fontdlgg.o \
-       monolib_checklst.o \
+       monolib_wince_checklst.o \
         monolib_choicece.o \
         monolib_crt.o \
         monolib_filedlgwce.o \
         monolib_choicece.o \
         monolib_crt.o \
         monolib_filedlgwce.o \
@@ -6968,314 +7750,329 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 =  \
  @COND_TOOLKIT_COCOA@   monolib_hid.o monolib_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3 =  \
         monolib_fontmgrcmn.o \
  @COND_TOOLKIT_COCOA@   monolib_hid.o monolib_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3 =  \
         monolib_fontmgrcmn.o \
-       monolib_caret.o \
-       monolib_colour.o \
-       monolib_icon.o \
-       monolib_imaglist.o \
+       monolib_generic_caret.o \
+       monolib_generic_colour.o \
+       monolib_generic_icon.o \
+       monolib_generic_imaglist.o \
         monolib_mask.o \
         monolib_mask.o \
-       monolib_timer.o \
-       monolib_app.o \
-       monolib_bitmap.o \
-       monolib_brush.o \
-       monolib_cursor.o \
-       monolib_dc.o \
-       monolib_dcclient.o \
-       monolib_dcmemory.o \
-       monolib_dcscreen.o \
-       monolib_evtloop.o \
-       monolib_font.o \
-       monolib_fontenum.o \
-       monolib_fontmgr.o \
-       monolib_nonownedwnd.o \
-       monolib_overlay.o \
-       monolib_pen.o \
-       monolib_region.o \
-       monolib_settings.o \
-       monolib_toplevel.o \
-       monolib_utils.o \
-       monolib_window.o \
+       monolib_dfb_app.o \
+       monolib_dfb_bitmap.o \
+       monolib_dfb_brush.o \
+       monolib_dfb_cursor.o \
+       monolib_dfb_dc.o \
+       monolib_dfb_dcclient.o \
+       monolib_dfb_dcmemory.o \
+       monolib_dfb_dcscreen.o \
+       monolib_dfb_evtloop.o \
+       monolib_dfb_font.o \
+       monolib_dfb_fontenum.o \
+       monolib_dfb_fontmgr.o \
+       monolib_dfb_nonownedwnd.o \
+       monolib_dfb_overlay.o \
+       monolib_dfb_pen.o \
+       monolib_dfb_region.o \
+       monolib_dfb_settings.o \
+       monolib_dfb_toplevel.o \
+       monolib_dfb_utils.o \
+       monolib_dfb_window.o \
         monolib_wrapdfb.o
  @COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_3 =  \
         monolib_wrapdfb.o
  @COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_3 =  \
-       monolib_caret.o \
-       monolib_imaglist.o \
-       monolib_dialup.o \
-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_utilsx11.o \
+       monolib_generic_caret.o \
+       monolib_generic_imaglist.o \
+       monolib_unix_dialup.o \
         monolib_displayx11.o \
         monolib_displayx11.o \
-       monolib_icon.o \
+       monolib_unix_fontenum.o \
+       monolib_unix_fontutil.o \
+       monolib_uiactionx11.o \
+       monolib_utilsx11.o \
+       monolib_generic_icon.o \
         monolib_paletteg.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_gsockgtk.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
+       monolib_gtk1_app.o \
+       monolib_gtk1_bitmap.o \
+       monolib_gtk1_brush.o \
+       monolib_gtk1_clipbrd.o \
+       monolib_gtk1_colour.o \
+       monolib_gtk1_cursor.o \
+       monolib_gtk1_data.o \
+       monolib_gtk1_dataobj.o \
+       monolib_gtk1_dc.o \
+       monolib_gtk1_dcclient.o \
+       monolib_gtk1_dcmemory.o \
+       monolib_gtk1_dcscreen.o \
+       monolib_gtk1_dnd.o \
+       monolib_gtk1_evtloop.o \
+       monolib_gtk1_font.o \
+       monolib_gtk1_sockgtk.o \
+       monolib_gtk1_main.o \
+       monolib_gtk1_minifram.o \
+       monolib_gtk1_pen.o \
+       monolib_gtk1_popupwin.o \
+       monolib_gtk1_region.o \
+       monolib_gtk1_renderer.o \
+       monolib_gtk1_settings.o \
+       monolib_gtk1_timer.o \
+       monolib_gtk1_tooltip.o \
+       monolib_gtk1_toplevel.o \
+       monolib_gtk1_utilsgtk.o \
+       monolib_gtk1_win_gtk.o \
+       monolib_gtk1_window.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_3)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_3 =  \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_3)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_3 =  \
-       monolib_caret.o \
-       monolib_imaglist.o \
-       monolib_dialup.o \
-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_utilsx11.o \
+       monolib_generic_caret.o \
+       monolib_generic_imaglist.o \
+       monolib_unix_dialup.o \
         monolib_displayx11.o \
         monolib_displayx11.o \
-       monolib_icon.o \
+       monolib_unix_fontenum.o \
+       monolib_unix_fontutil.o \
+       monolib_uiactionx11.o \
+       monolib_utilsx11.o \
+       monolib_generic_icon.o \
         monolib_paletteg.o \
         monolib_paletteg.o \
-       monolib_app.o \
+       monolib_gtk_app.o \
         monolib_assertdlg_gtk.o \
         monolib_assertdlg_gtk.o \
-       monolib_bitmap.o \
-       monolib_brush.o \
-       monolib_clipbrd.o \
-       monolib_colour.o \
-       monolib_cursor.o \
-       monolib_dataobj.o \
-       monolib_dc.o \
-       monolib_dcclient.o \
-       monolib_dcmemory.o \
-       monolib_dcscreen.o \
-       monolib_dnd.o \
-       monolib_evtloop.o \
+       monolib_gtk_bitmap.o \
+       monolib_gtk_brush.o \
+       monolib_gtk_clipbrd.o \
+       monolib_gtk_colour.o \
+       monolib_gtk_cursor.o \
+       monolib_gtk_dataobj.o \
+       monolib_gtk_dc.o \
+       monolib_gtk_dcclient.o \
+       monolib_gtk_dcmemory.o \
+       monolib_gtk_dcscreen.o \
+       monolib_gtk_dnd.o \
+       monolib_gtk_evtloop.o \
         monolib_filectrl.o \
         monolib_filectrl.o \
-       monolib_font.o \
-       monolib_gsockgtk.o \
-       monolib_minifram.o \
-       monolib_pen.o \
-       monolib_popupwin.o \
+       monolib_filehistory.o \
+       monolib_gtk_font.o \
+       monolib_gtk_sockgtk.o \
+       monolib_gtk_minifram.o \
+       monolib_gtk_pen.o \
+       monolib_gtk_popupwin.o \
         monolib_private.o \
         monolib_private.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
+       monolib_gtk_region.o \
+       monolib_gtk_renderer.o \
+       monolib_gtk_settings.o \
+       monolib_gtk_timer.o \
+       monolib_gtk_tooltip.o \
+       monolib_gtk_toplevel.o \
+       monolib_gtk_utilsgtk.o \
+       monolib_gtk_win_gtk.o \
+       monolib_gtk_window.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_3)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_3 =  \
         monolib_fontmgrcmn.o \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_3)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_3 =  \
         monolib_fontmgrcmn.o \
-       monolib_caret.o \
-       monolib_colour.o \
-       monolib_icon.o \
-       monolib_imaglist.o \
+       monolib_generic_caret.o \
+       monolib_generic_colour.o \
+       monolib_generic_icon.o \
+       monolib_generic_imaglist.o \
         monolib_mask.o \
         monolib_mask.o \
-       monolib_timer.o \
-       monolib_app.o \
-       monolib_bitmap.o \
-       monolib_brush.o \
-       monolib_clipbrd.o \
-       monolib_cursor.o \
-       monolib_data.o \
-       monolib_dc.o \
-       monolib_dcclient.o \
-       monolib_dcmemory.o \
-       monolib_dcscreen.o \
+       monolib_generic_timer.o \
+       monolib_mgl_app.o \
+       monolib_mgl_bitmap.o \
+       monolib_mgl_brush.o \
+       monolib_mgl_clipbrd.o \
+       monolib_mgl_cursor.o \
+       monolib_mgl_data.o \
+       monolib_mgl_dc.o \
+       monolib_mgl_dcclient.o \
+       monolib_mgl_dcmemory.o \
+       monolib_mgl_dcscreen.o \
         monolib_dirmgl.o \
         monolib_dirmgl.o \
-       monolib_evtloop.o \
-       monolib_font.o \
-       monolib_fontenum.o \
-       monolib_fontmgr.o \
-       monolib_fontutil.o \
-       monolib_palette.o \
-       monolib_pen.o \
-       monolib_region.o \
-       monolib_settings.o \
-       monolib_toplevel.o \
-       monolib_utils.o \
-       monolib_window.o
+       monolib_mgl_evtloop.o \
+       monolib_mgl_font.o \
+       monolib_mgl_fontenum.o \
+       monolib_mgl_fontmgr.o \
+       monolib_mgl_fontutil.o \
+       monolib_mgl_palette.o \
+       monolib_mgl_pen.o \
+       monolib_mgl_region.o \
+       monolib_mgl_settings.o \
+       monolib_mgl_toplevel.o \
+       monolib_mgl_utils.o \
+       monolib_mgl_window.o
  @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_3)
  COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_3 =  \
  @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_imaglist.o \
-       monolib_dialup.o \
-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_utilsx11.o \
+       monolib_generic_caret.o \
+       monolib_generic_imaglist.o \
+       monolib_unix_dialup.o \
         monolib_displayx11.o \
         monolib_displayx11.o \
-       monolib_bitmap.o \
-       monolib_brush.o \
-       monolib_palette.o \
-       monolib_pen.o \
-       monolib_region.o \
+       monolib_unix_fontenum.o \
+       monolib_unix_fontutil.o \
+       monolib_uiactionx11.o \
+       monolib_utilsx11.o \
+       monolib_x11_bitmap.o \
+       monolib_x11_brush.o \
+       monolib_x11_palette.o \
+       monolib_x11_pen.o \
+       monolib_x11_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_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_activex.o \
+       monolib_msw_app.o \
+       monolib_msw_bitmap.o \
+       monolib_msw_brush.o \
+       monolib_msw_caret.o \
+       monolib_msw_clipbrd.o \
+       monolib_msw_colour.o \
+       monolib_msw_cursor.o \
+       monolib_msw_data.o \
+       monolib_msw_dc.o \
+       monolib_msw_dcclient.o \
+       monolib_msw_dcmemory.o \
+       monolib_msw_dcprint.o \
+       monolib_msw_dcscreen.o \
+       monolib_msw_dialup.o \
         monolib_dib.o \
         monolib_dib.o \
-       monolib_display.o \
+       monolib_msw_display.o \
         monolib_enhmeta.o \
         monolib_enhmeta.o \
-       monolib_font.o \
-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_gdiimage.o \
-       monolib_gdiobj.o \
+       monolib_msw_font.o \
+       monolib_msw_fontenum.o \
+       monolib_msw_fontutil.o \
+       monolib_msw_gdiimage.o \
+       monolib_msw_gdiobj.o \
         monolib_gdiplus.o \
         monolib_gdiplus.o \
-       monolib_graphics.o \
-       monolib_icon.o \
-       monolib_imaglist.o \
-       monolib_minifram.o \
-       monolib_dataobj.o \
+       monolib_msw_graphics.o \
+       monolib_msw_icon.o \
+       monolib_msw_imaglist.o \
+       monolib_msw_minifram.o \
+       monolib_ole_dataobj.o \
         monolib_dropsrc.o \
         monolib_droptgt.o \
         monolib_oleutils.o \
         monolib_dropsrc.o \
         monolib_droptgt.o \
         monolib_oleutils.o \
-       monolib_palette.o \
-       monolib_pen.o \
-       monolib_popupwin.o \
-       monolib_printdlg.o \
+       monolib_msw_palette.o \
+       monolib_msw_pen.o \
+       monolib_msw_popupwin.o \
+       monolib_msw_printdlg.o \
         monolib_printwin.o \
         monolib_printwin.o \
-       monolib_region.o \
-       monolib_renderer.o \
-       monolib_settings.o \
-       monolib_tooltip.o \
-       monolib_toplevel.o \
-       monolib_utilsgui.o \
+       monolib_msw_region.o \
+       monolib_msw_renderer.o \
+       monolib_msw_settings.o \
+       monolib_msw_tooltip.o \
+       monolib_msw_toplevel.o \
+       monolib_uiaction.o \
+       monolib_msw_utilsgui.o \
         monolib_uxtheme.o \
         monolib_uxtheme.o \
-       monolib_window.o \
+       monolib_msw_window.o \
         monolib_helpchm.o \
         monolib_helpchm.o \
-       monolib_helpwin.o \
+       monolib_msw_helpwin.o \
         monolib_automtn.o \
         monolib_uuid.o
  @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3)
  @COND_TOOLKIT_OSX_CARBON@__LOWLEVEL_SRC_OBJECTS_3 \
         monolib_automtn.o \
         monolib_uuid.o
  @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3)
  @COND_TOOLKIT_OSX_CARBON@__LOWLEVEL_SRC_OBJECTS_3 \
-@COND_TOOLKIT_OSX_CARBON@      = $(__OSX_LOWLEVEL_SRC_OBJECTS_17)
+@COND_TOOLKIT_OSX_CARBON@      = $(__OSX_LOWLEVEL_SRC_OBJECTS_27)
  @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \
  @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \
-@COND_TOOLKIT_OSX_COCOA@       $(__OSX_LOWLEVEL_SRC_OBJECTS_17)
+@COND_TOOLKIT_OSX_COCOA@       $(__OSX_LOWLEVEL_SRC_OBJECTS_27)
+@COND_TOOLKIT_OSX_IPHONE@__LOWLEVEL_SRC_OBJECTS_3 \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__OSX_LOWLEVEL_SRC_OBJECTS_27)
  @COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_3 = 
  COND_TOOLKIT_WINCE___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_activex.o \
+       monolib_msw_app.o \
+       monolib_msw_bitmap.o \
+       monolib_msw_brush.o \
+       monolib_msw_caret.o \
+       monolib_msw_clipbrd.o \
+       monolib_msw_colour.o \
+       monolib_msw_cursor.o \
+       monolib_msw_data.o \
+       monolib_msw_dc.o \
+       monolib_msw_dcclient.o \
+       monolib_msw_dcmemory.o \
+       monolib_msw_dcprint.o \
+       monolib_msw_dcscreen.o \
+       monolib_msw_dialup.o \
         monolib_dib.o \
         monolib_dib.o \
-       monolib_display.o \
+       monolib_msw_display.o \
         monolib_enhmeta.o \
         monolib_enhmeta.o \
-       monolib_font.o \
-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_gdiimage.o \
-       monolib_gdiobj.o \
+       monolib_msw_font.o \
+       monolib_msw_fontenum.o \
+       monolib_msw_fontutil.o \
+       monolib_msw_gdiimage.o \
+       monolib_msw_gdiobj.o \
         monolib_gdiplus.o \
         monolib_gdiplus.o \
-       monolib_graphics.o \
-       monolib_icon.o \
-       monolib_imaglist.o \
-       monolib_minifram.o \
-       monolib_dataobj.o \
+       monolib_msw_graphics.o \
+       monolib_msw_icon.o \
+       monolib_msw_imaglist.o \
+       monolib_msw_minifram.o \
+       monolib_ole_dataobj.o \
         monolib_dropsrc.o \
         monolib_droptgt.o \
         monolib_oleutils.o \
         monolib_dropsrc.o \
         monolib_droptgt.o \
         monolib_oleutils.o \
-       monolib_palette.o \
-       monolib_pen.o \
-       monolib_popupwin.o \
-       monolib_printdlg.o \
+       monolib_msw_palette.o \
+       monolib_msw_pen.o \
+       monolib_msw_popupwin.o \
+       monolib_msw_printdlg.o \
         monolib_printwin.o \
         monolib_printwin.o \
-       monolib_region.o \
-       monolib_renderer.o \
-       monolib_settings.o \
-       monolib_tooltip.o \
-       monolib_toplevel.o \
-       monolib_utilsgui.o \
+       monolib_msw_region.o \
+       monolib_msw_renderer.o \
+       monolib_msw_settings.o \
+       monolib_msw_tooltip.o \
+       monolib_msw_toplevel.o \
+       monolib_uiaction.o \
+       monolib_msw_utilsgui.o \
         monolib_uxtheme.o \
         monolib_uxtheme.o \
-       monolib_window.o
+       monolib_msw_window.o
  @COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_3)
  COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 =  \
  @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_imaglist.o \
-       monolib_dialup.o \
-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_utilsx11.o \
+       monolib_generic_caret.o \
+       monolib_generic_imaglist.o \
+       monolib_unix_dialup.o \
         monolib_displayx11.o \
         monolib_displayx11.o \
-       monolib_icon.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_minifram.o \
+       monolib_unix_fontenum.o \
+       monolib_unix_fontutil.o \
+       monolib_uiactionx11.o \
+       monolib_utilsx11.o \
+       monolib_generic_icon.o \
+       monolib_generic_timer.o \
+       monolib_x11_app.o \
+       monolib_x11_bitmap.o \
+       monolib_x11_brush.o \
+       monolib_x11_clipbrd.o \
+       monolib_x11_colour.o \
+       monolib_x11_cursor.o \
+       monolib_x11_data.o \
+       monolib_x11_dataobj.o \
+       monolib_x11_dc.o \
+       monolib_x11_dcclient.o \
+       monolib_x11_dcmemory.o \
+       monolib_x11_dcscreen.o \
+       monolib_x11_evtloop.o \
+       monolib_x11_font.o \
+       monolib_x11_minifram.o \
         monolib_nanox.o \
         monolib_nanox.o \
-       monolib_palette.o \
-       monolib_pen.o \
-       monolib_popupwin.o \
-       monolib_region.o \
+       monolib_x11_palette.o \
+       monolib_x11_pen.o \
+       monolib_x11_popupwin.o \
+       monolib_x11_region.o \
         monolib_reparent.o \
         monolib_reparent.o \
-       monolib_settings.o \
-       monolib_toplevel.o \
-       monolib_utils.o \
+       monolib_x11_settings.o \
+       monolib_x11_toplevel.o \
+       monolib_x11_utils.o \
         monolib_utilsx.o \
         monolib_utilsx.o \
-       monolib_window.o
+       monolib_x11_window.o
  @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3)
  COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_1 =  \
         monolib_animatecmn.o \
         monolib_bmpcboxcmn.o \
         monolib_calctrlcmn.o \
         monolib_datavcmn.o \
  @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3)
  COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_1 =  \
         monolib_animatecmn.o \
         monolib_bmpcboxcmn.o \
         monolib_calctrlcmn.o \
         monolib_datavcmn.o \
+       monolib_gridcmn.o \
         monolib_hyperlnkcmn.o \
         monolib_hyperlnkcmn.o \
+       monolib_odcombocmn.o \
         monolib_aboutdlgg.o \
         monolib_aboutdlgg.o \
+       monolib_bannerwindow.o \
         monolib_bmpcboxg.o \
         monolib_calctrlg.o \
         monolib_bmpcboxg.o \
         monolib_calctrlg.o \
+       monolib_commandlinkbuttong.o \
         monolib_datavgen.o \
         monolib_datectlg.o \
         monolib_editlbox.o \
         monolib_grid.o \
         monolib_gridctrl.o \
         monolib_datavgen.o \
         monolib_datectlg.o \
         monolib_editlbox.o \
         monolib_grid.o \
         monolib_gridctrl.o \
+       monolib_grideditors.o \
         monolib_gridsel.o \
         monolib_helpext.o \
         monolib_hyperlinkg.o \
         monolib_gridsel.o \
         monolib_helpext.o \
         monolib_hyperlinkg.o \
@@ -7286,6 +8083,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_1 =  \
         monolib_sashwin.o \
         monolib_splash.o \
         monolib_tipdlg.o \
         monolib_sashwin.o \
         monolib_splash.o \
         monolib_tipdlg.o \
+       monolib_treelist.o \
         monolib_wizard.o \
         $(__ADVANCED_PLATFORM_SRC_OBJECTS_0) \
         $(__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1)
         monolib_wizard.o \
         $(__ADVANCED_PLATFORM_SRC_OBJECTS_0) \
         $(__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1)
@@ -7295,15 +8093,20 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_1 =  \
         monolib_bmpcboxcmn.o \
         monolib_calctrlcmn.o \
         monolib_datavcmn.o \
         monolib_bmpcboxcmn.o \
         monolib_calctrlcmn.o \
         monolib_datavcmn.o \
+       monolib_gridcmn.o \
         monolib_hyperlnkcmn.o \
         monolib_hyperlnkcmn.o \
+       monolib_odcombocmn.o \
         monolib_aboutdlgg.o \
         monolib_aboutdlgg.o \
+       monolib_bannerwindow.o \
         monolib_bmpcboxg.o \
         monolib_calctrlg.o \
         monolib_bmpcboxg.o \
         monolib_calctrlg.o \
+       monolib_commandlinkbuttong.o \
         monolib_datavgen.o \
         monolib_datectlg.o \
         monolib_editlbox.o \
         monolib_grid.o \
         monolib_gridctrl.o \
         monolib_datavgen.o \
         monolib_datectlg.o \
         monolib_editlbox.o \
         monolib_grid.o \
         monolib_gridctrl.o \
+       monolib_grideditors.o \
         monolib_gridsel.o \
         monolib_helpext.o \
         monolib_hyperlinkg.o \
         monolib_gridsel.o \
         monolib_helpext.o \
         monolib_hyperlinkg.o \
@@ -7314,52 +8117,63 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_1 =  \
         monolib_sashwin.o \
         monolib_splash.o \
         monolib_tipdlg.o \
         monolib_sashwin.o \
         monolib_splash.o \
         monolib_tipdlg.o \
+       monolib_treelist.o \
         monolib_wizard.o \
         $(__ADVANCED_PLATFORM_SRC_OBJECTS_0) \
         monolib_animateg.o
  @COND_WXUNIV_1@__ADVANCED_SRC_OBJECTS_1 = $(COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_1)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 =  \
         monolib_wizard.o \
         $(__ADVANCED_PLATFORM_SRC_OBJECTS_0) \
         monolib_animateg.o
  @COND_WXUNIV_1@__ADVANCED_SRC_OBJECTS_1 = $(COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_1)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 =  \
-       monolib_aboutdlg.o \
+       monolib_gtk_aboutdlg.o \
         monolib_animate.o \
         monolib_animate.o \
-       monolib_bmpcbox.o \
-       monolib_calctrl.o \
-       monolib_dataview.o \
-       monolib_hyperlink.o
+       monolib_gtk_bmpcbox.o \
+       monolib_gtk_calctrl.o \
+       monolib_gtk_dataview.o \
+       monolib_gtk_hyperlink.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1)
  COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 =  \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1)
  COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 =  \
-       monolib_bmpcbox.o \
-       monolib_calctrl.o \
+       monolib_animateg.o \
+       monolib_msw_bmpcbox.o \
+       monolib_msw_calctrl.o \
+       monolib_commandlinkbutton.o \
         monolib_datecontrols.o \
         monolib_datecontrols.o \
-       monolib_datectrl.o
+       monolib_datectrl.o \
+       monolib_msw_hyperlink.o
  @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1)
  COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 =  \
  @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1)
  COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 =  \
-       monolib_bmpcbox.o \
-       monolib_calctrl.o \
+       monolib_animateg.o \
+       monolib_msw_bmpcbox.o \
+       monolib_msw_calctrl.o \
+       monolib_commandlinkbutton.o \
         monolib_datecontrols.o \
         monolib_datecontrols.o \
-       monolib_datectrl.o
+       monolib_datectrl.o \
+       monolib_msw_hyperlink.o
  @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1)
  @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1)
-@COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_mediactrl.o
-@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_mediactrl.o 
-@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_mediactrl.o
-COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_1 =  \
-       monolib_mediactrl_am.o \
-       monolib_mediactrl_wmp10.o \
-       monolib_mediactrl_qt.o \
-       monolib_activex.o
-@COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_1)
+@COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \
+@COND_TOOLKIT_COCOA@   monolib_cocoa_mediactrl.o
+@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \
+@COND_TOOLKIT_GTK@     monolib_unix_mediactrl.o
+@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \
+@COND_TOOLKIT_MOTIF@   monolib_unix_mediactrl.o
+@COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \
+@COND_TOOLKIT_MSW@     monolib_mediactrl_am.o monolib_mediactrl_wmp10.o \
+@COND_TOOLKIT_MSW@     monolib_mediactrl_qt.o
  @COND_TOOLKIT_OSX_CARBON@__MEDIA_PLATFORM_SRC_OBJECTS_1 \
  @COND_TOOLKIT_OSX_CARBON@__MEDIA_PLATFORM_SRC_OBJECTS_1 \
-@COND_TOOLKIT_OSX_CARBON@      = monolib_mediactrl.o
+@COND_TOOLKIT_OSX_CARBON@      = monolib_carbon_mediactrl.o
+@COND_TOOLKIT_OSX_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_1 = 
+@COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS_1 = 
  @COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS_1 = 
  @COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS_1 = 
-COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_1 =  \
-       monolib_mediactrl_am.o \
-       monolib_mediactrl_wmp10.o \
-       monolib_mediactrl_qt.o \
-       monolib_activex.o
-@COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_1)
-@COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_mediactrl.o
+@COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \
+@COND_TOOLKIT_WINCE@   monolib_mediactrl_am.o monolib_mediactrl_wmp10.o \
+@COND_TOOLKIT_WINCE@   monolib_mediactrl_qt.o
+@COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_unix_mediactrl.o
  @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_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_MACOSX_1@__WEBVIEW_SRC_PLATFORM_OBJECTS_1 \
+@COND_PLATFORM_MACOSX_1@       = monolib_osx_webview_webkit.o
+@COND_PLATFORM_UNIX_1@__WEBVIEW_SRC_PLATFORM_OBJECTS_1 \
+@COND_PLATFORM_UNIX_1@ = monolib_gtk_webview_webkit.o
+@COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS_1 = monolib_webview_ie.o
  @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_1 \
  @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@   = monolib_sound_sdl.o
  COND_MONOLITHIC_0_SHARED_1___basedll___depname = \
  @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_1 \
  @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@   = monolib_sound_sdl.o
  COND_MONOLITHIC_0_SHARED_1___basedll___depname = \
@@ -7377,18 +8191,19 @@ COND_PLATFORM_OS2_1___basedll___importlib = -import \
  COND_WINDOWS_IMPLIB_1___basedll___importlib = \
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__basedll___importlib = $(COND_WINDOWS_IMPLIB_1___basedll___importlib)
  COND_WINDOWS_IMPLIB_1___basedll___importlib = \
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__basedll___importlib = $(COND_WINDOWS_IMPLIB_1___basedll___importlib)
-@COND_GCC_PCH_1@__basedll_PCH_INC = -I.pch/wxprec_basedll
-@COND_ICC_PCH_1@__basedll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_basedll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_basedll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_basedll/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__basedll_PCH_INC = -I./.pch/wxprec_basedll
+@COND_ICC_PCH_1@__basedll_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_basedll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_basedll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_basedll/wx/wxprec.h.gch
  COND_USE_SOVERLINUX_1___basedll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_USE_SOVERLINUX_1@__basedll___soname_flags = $(COND_USE_SOVERLINUX_1___basedll___soname_flags)
  COND_USE_SOVERSOLARIS_1___basedll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_USE_SOVERSOLARIS_1@__basedll___soname_flags = $(COND_USE_SOVERSOLARIS_1___basedll___soname_flags)
  COND_USE_SOVERLINUX_1___basedll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_USE_SOVERLINUX_1@__basedll___soname_flags = $(COND_USE_SOVERLINUX_1___basedll___soname_flags)
  COND_USE_SOVERSOLARIS_1___basedll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_USE_SOVERSOLARIS_1@__basedll___soname_flags = $(COND_USE_SOVERSOLARIS_1___basedll___soname_flags)
-COND_USE_SOSYMLINKS_1___basedll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+COND_USE_SOTWOSYMLINKS_1___basedll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm \
+       -f \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
@@ -7397,8 +8212,14 @@ COND_USE_SOSYMLINKS_1___basedll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__basedll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___basedll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___basedll___so_symlinks_inst_cmd = rm -f \
+@COND_USE_SOTWOSYMLINKS_1@__basedll___so_symlinks_cmd = $(COND_USE_SOTWOSYMLINKS_1___basedll___so_symlinks_cmd)
+COND_USE_SOVERSOLARIS_1___basedll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOVERSOLARIS_1@__basedll___so_symlinks_cmd = $(COND_USE_SOVERSOLARIS_1___basedll___so_symlinks_cmd)
+COND_USE_SOTWOSYMLINKS_1___basedll___so_symlinks_inst_cmd = rm -f \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
@@ -7407,85 +8228,99 @@ COND_USE_SOSYMLINKS_1___basedll___so_symlinks_inst_cmd = rm -f \
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__basedll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___basedll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___basedll___so_symlinks_uninst_cmd = rm -f \
+@COND_USE_SOTWOSYMLINKS_1@__basedll___so_symlinks_inst_cmd = $(COND_USE_SOTWOSYMLINKS_1___basedll___so_symlinks_inst_cmd)
+COND_USE_SOVERSOLARIS_1___basedll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX);
+@COND_USE_SOVERSOLARIS_1@__basedll___so_symlinks_inst_cmd = $(COND_USE_SOVERSOLARIS_1___basedll___so_symlinks_inst_cmd)
+COND_USE_SOTWOSYMLINKS_1___basedll___so_symlinks_uninst_cmd = rm -f \
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__basedll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___basedll___so_symlinks_uninst_cmd)
+@COND_USE_SOTWOSYMLINKS_1@__basedll___so_symlinks_uninst_cmd = $(COND_USE_SOTWOSYMLINKS_1___basedll___so_symlinks_uninst_cmd)
+COND_USE_SOVERSOLARIS_1___basedll___so_symlinks_uninst_cmd = rm -f \
+       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOVERSOLARIS_1@__basedll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___basedll___so_symlinks_uninst_cmd)
  @COND_PLATFORM_WIN32_1@__basedll___win32rc = basedll_version_rc.o
  COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
  @COND_PLATFORM_WIN32_1@__basedll___win32rc = basedll_version_rc.o
  COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
-       basedll_mimetype.o \
+       basedll_core_mimetype.o \
         basedll_cfstring.o \
         basedll_cfstring.o \
-       basedll_gsockosx.o \
+       basedll_evtloop_cf.o \
         basedll_stdpaths_cf.o \
         basedll_strconv_cf.o \
         basedll_utilsexc_base.o \
         basedll_fdiodispatcher.o \
         basedll_selectdispatcher.o \
         basedll_stdpaths_cf.o \
         basedll_strconv_cf.o \
         basedll_utilsexc_base.o \
         basedll_fdiodispatcher.o \
         basedll_selectdispatcher.o \
-       basedll_epolldispatcher.o \
         basedll_appunix.o \
         basedll_appunix.o \
-       basedll_evtloopunix.o \
-       basedll_dir.o \
+       basedll_unix_dir.o \
         basedll_dlunix.o \
         basedll_dlunix.o \
-       basedll_snglinst.o \
-       basedll_stdpaths.o \
+       basedll_epolldispatcher.o \
+       basedll_evtloopunix.o \
+       basedll_fdiounix.o \
+       basedll_unix_snglinst.o \
+       basedll_unix_stackwalk.o \
+       basedll_unix_stdpaths.o \
         basedll_timerunx.o \
         basedll_threadpsx.o \
         basedll_timerunx.o \
         basedll_threadpsx.o \
-       basedll_stackwalk.o \
-       basedll_utilsunx.o
+       basedll_utilsunx.o \
+       basedll_fswatcher_kqueue.o
  @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_2)
  @COND_PLATFORM_MSDOS_1@__BASE_PLATFORM_SRC_OBJECTS_2 \
  @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_2)
  @COND_PLATFORM_MSDOS_1@__BASE_PLATFORM_SRC_OBJECTS_2 \
-@COND_PLATFORM_MSDOS_1@        = basedll_dir.o basedll_mimetype.o \
+@COND_PLATFORM_MSDOS_1@        = basedll_msdos_dir.o basedll_msdos_mimetype.o \
  @COND_PLATFORM_MSDOS_1@        basedll_utilsdos.o
  COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
         basedll_fdiodispatcher.o \
         basedll_selectdispatcher.o \
  @COND_PLATFORM_MSDOS_1@        basedll_utilsdos.o
  COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
         basedll_fdiodispatcher.o \
         basedll_selectdispatcher.o \
-       basedll_gsocketiohandler.o \
         basedll_appunix.o \
         basedll_evtloopunix.o \
         basedll_timerunx.o \
         basedll_appunix.o \
         basedll_evtloopunix.o \
         basedll_timerunx.o \
-       basedll_dir.o \
-       basedll_mimetype.o \
-       basedll_stdpaths.o \
-       basedll_thread.o \
-       basedll_utils.o \
-       basedll_utilsexc.o
+       basedll_os2_dir.o \
+       basedll_os2_mimetype.o \
+       basedll_os2_snglinst.o \
+       basedll_os2_stdpaths.o \
+       basedll_os2_thread.o \
+       basedll_os2_utils.o \
+       basedll_os2_utilsexc.o
  @COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_2)
  COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
         basedll_fdiodispatcher.o \
         basedll_selectdispatcher.o \
  @COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_2)
  COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
         basedll_fdiodispatcher.o \
         basedll_selectdispatcher.o \
-       basedll_epolldispatcher.o \
         basedll_appunix.o \
         basedll_appunix.o \
-       basedll_evtloopunix.o \
-       basedll_dir.o \
+       basedll_unix_dir.o \
         basedll_dlunix.o \
         basedll_dlunix.o \
-       basedll_snglinst.o \
-       basedll_stdpaths.o \
+       basedll_epolldispatcher.o \
+       basedll_evtloopunix.o \
+       basedll_fdiounix.o \
+       basedll_unix_snglinst.o \
+       basedll_unix_stackwalk.o \
+       basedll_unix_stdpaths.o \
         basedll_timerunx.o \
         basedll_threadpsx.o \
         basedll_timerunx.o \
         basedll_threadpsx.o \
-       basedll_stackwalk.o \
         basedll_utilsunx.o \
         basedll_utilsunx.o \
-       basedll_mimetype.o \
-       basedll_gsocketiohandler.o
+       basedll_fswatcher_kqueue.o \
+       basedll_unix_mimetype.o \
+       basedll_fswatcher_inotify.o
  @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_2)
  COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
         basedll_basemsw.o \
         basedll_crashrpt.o \
         basedll_debughlp.o \
         basedll_dde.o \
  @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_2)
  COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
         basedll_basemsw.o \
         basedll_crashrpt.o \
         basedll_debughlp.o \
         basedll_dde.o \
-       basedll_dir.o \
+       basedll_msw_dir.o \
         basedll_dlmsw.o \
         basedll_dlmsw.o \
-       basedll_mimetype.o \
+       basedll_msw_mimetype.o \
         basedll_power.o \
         basedll_regconf.o \
         basedll_registry.o \
         basedll_power.o \
         basedll_regconf.o \
         basedll_registry.o \
-       basedll_snglinst.o \
-       basedll_stackwalk.o \
-       basedll_stdpaths.o \
-       basedll_thread.o \
+       basedll_msw_snglinst.o \
+       basedll_msw_stackwalk.o \
+       basedll_msw_stdpaths.o \
+       basedll_msw_thread.o \
         basedll_timer.o \
         basedll_timer.o \
-       basedll_utils.o \
-       basedll_utilsexc.o \
+       basedll_msw_utils.o \
+       basedll_msw_utilsexc.o \
+       basedll_fswatcher.o \
         $(__BASE_WINCE_SRC_OBJECTS_2)
  @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2)
  @COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS_2 = basedll_time.o
         $(__BASE_WINCE_SRC_OBJECTS_2)
  @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2)
  @COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS_2 = basedll_time.o
@@ -7494,93 +8329,98 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_2 =  \
  @COND_PLATFORM_WIN32_1@        = basedll_evtloop.o basedll_main.o basedll_mslu.o \
  @COND_PLATFORM_WIN32_1@        basedll_volume.o
  @COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_2 \
  @COND_PLATFORM_WIN32_1@        = basedll_evtloop.o basedll_main.o basedll_mslu.o \
  @COND_PLATFORM_WIN32_1@        basedll_volume.o
  @COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_2 \
-@COND_TOOLKIT_OSX_CARBON@      = basedll_utils.o basedll_uma.o
+@COND_TOOLKIT_OSX_CARBON@      = basedll_carbon_utils.o basedll_uma.o
  @COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_2 \
  @COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_2 \
-@COND_TOOLKIT_OSX_COCOA@       = basedll_utils.o
+@COND_TOOLKIT_OSX_COCOA@       = basedll_cocoa_utils.o
  COND_MONOLITHIC_0_SHARED_0___baselib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_MONOLITHIC_0_SHARED_0@__baselib___depname = $(COND_MONOLITHIC_0_SHARED_0___baselib___depname)
  @COND_MONOLITHIC_0_SHARED_0@__install_baselib___depname = install_baselib
  @COND_MONOLITHIC_0_SHARED_0@__uninstall_baselib___depname \
  @COND_MONOLITHIC_0_SHARED_0@   = uninstall_baselib
  COND_MONOLITHIC_0_SHARED_0___baselib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_MONOLITHIC_0_SHARED_0@__baselib___depname = $(COND_MONOLITHIC_0_SHARED_0___baselib___depname)
  @COND_MONOLITHIC_0_SHARED_0@__install_baselib___depname = install_baselib
  @COND_MONOLITHIC_0_SHARED_0@__uninstall_baselib___depname \
  @COND_MONOLITHIC_0_SHARED_0@   = uninstall_baselib
-@COND_GCC_PCH_1@__baselib_PCH_INC = -I.pch/wxprec_baselib
-@COND_ICC_PCH_1@__baselib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_baselib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_baselib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_baselib/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__baselib_PCH_INC = -I./.pch/wxprec_baselib
+@COND_ICC_PCH_1@__baselib_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_baselib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_baselib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_baselib/wx/wxprec.h.gch
  COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_3 =  \
  COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_3 =  \
-       baselib_mimetype.o \
+       baselib_core_mimetype.o \
         baselib_cfstring.o \
         baselib_cfstring.o \
-       baselib_gsockosx.o \
+       baselib_evtloop_cf.o \
         baselib_stdpaths_cf.o \
         baselib_strconv_cf.o \
         baselib_utilsexc_base.o \
         baselib_fdiodispatcher.o \
         baselib_selectdispatcher.o \
         baselib_stdpaths_cf.o \
         baselib_strconv_cf.o \
         baselib_utilsexc_base.o \
         baselib_fdiodispatcher.o \
         baselib_selectdispatcher.o \
-       baselib_epolldispatcher.o \
         baselib_appunix.o \
         baselib_appunix.o \
-       baselib_evtloopunix.o \
-       baselib_dir.o \
+       baselib_unix_dir.o \
         baselib_dlunix.o \
         baselib_dlunix.o \
-       baselib_snglinst.o \
-       baselib_stdpaths.o \
+       baselib_epolldispatcher.o \
+       baselib_evtloopunix.o \
+       baselib_fdiounix.o \
+       baselib_unix_snglinst.o \
+       baselib_unix_stackwalk.o \
+       baselib_unix_stdpaths.o \
         baselib_timerunx.o \
         baselib_threadpsx.o \
         baselib_timerunx.o \
         baselib_threadpsx.o \
-       baselib_stackwalk.o \
-       baselib_utilsunx.o
+       baselib_utilsunx.o \
+       baselib_fswatcher_kqueue.o
  @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_3)
  @COND_PLATFORM_MSDOS_1@__BASE_PLATFORM_SRC_OBJECTS_3 \
  @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_MACOSX_1___BASE_PLATFORM_SRC_OBJECTS_3)
  @COND_PLATFORM_MSDOS_1@__BASE_PLATFORM_SRC_OBJECTS_3 \
-@COND_PLATFORM_MSDOS_1@        = baselib_dir.o baselib_mimetype.o \
+@COND_PLATFORM_MSDOS_1@        = baselib_msdos_dir.o baselib_msdos_mimetype.o \
  @COND_PLATFORM_MSDOS_1@        baselib_utilsdos.o
  COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_3 =  \
         baselib_fdiodispatcher.o \
         baselib_selectdispatcher.o \
  @COND_PLATFORM_MSDOS_1@        baselib_utilsdos.o
  COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_3 =  \
         baselib_fdiodispatcher.o \
         baselib_selectdispatcher.o \
-       baselib_gsocketiohandler.o \
         baselib_appunix.o \
         baselib_evtloopunix.o \
         baselib_timerunx.o \
         baselib_appunix.o \
         baselib_evtloopunix.o \
         baselib_timerunx.o \
-       baselib_dir.o \
-       baselib_mimetype.o \
-       baselib_stdpaths.o \
-       baselib_thread.o \
-       baselib_utils.o \
-       baselib_utilsexc.o
+       baselib_os2_dir.o \
+       baselib_os2_mimetype.o \
+       baselib_os2_snglinst.o \
+       baselib_os2_stdpaths.o \
+       baselib_os2_thread.o \
+       baselib_os2_utils.o \
+       baselib_os2_utilsexc.o
  @COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_3)
  COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_3 =  \
         baselib_fdiodispatcher.o \
         baselib_selectdispatcher.o \
  @COND_PLATFORM_OS2_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_OS2_1___BASE_PLATFORM_SRC_OBJECTS_3)
  COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_3 =  \
         baselib_fdiodispatcher.o \
         baselib_selectdispatcher.o \
-       baselib_epolldispatcher.o \
         baselib_appunix.o \
         baselib_appunix.o \
-       baselib_evtloopunix.o \
-       baselib_dir.o \
+       baselib_unix_dir.o \
         baselib_dlunix.o \
         baselib_dlunix.o \
-       baselib_snglinst.o \
-       baselib_stdpaths.o \
+       baselib_epolldispatcher.o \
+       baselib_evtloopunix.o \
+       baselib_fdiounix.o \
+       baselib_unix_snglinst.o \
+       baselib_unix_stackwalk.o \
+       baselib_unix_stdpaths.o \
         baselib_timerunx.o \
         baselib_threadpsx.o \
         baselib_timerunx.o \
         baselib_threadpsx.o \
-       baselib_stackwalk.o \
         baselib_utilsunx.o \
         baselib_utilsunx.o \
-       baselib_mimetype.o \
-       baselib_gsocketiohandler.o
+       baselib_fswatcher_kqueue.o \
+       baselib_unix_mimetype.o \
+       baselib_fswatcher_inotify.o
  @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_3)
  COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 =  \
         baselib_basemsw.o \
         baselib_crashrpt.o \
         baselib_debughlp.o \
         baselib_dde.o \
  @COND_PLATFORM_UNIX_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS_3)
  COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 =  \
         baselib_basemsw.o \
         baselib_crashrpt.o \
         baselib_debughlp.o \
         baselib_dde.o \
-       baselib_dir.o \
+       baselib_msw_dir.o \
         baselib_dlmsw.o \
         baselib_dlmsw.o \
-       baselib_mimetype.o \
+       baselib_msw_mimetype.o \
         baselib_power.o \
         baselib_regconf.o \
         baselib_registry.o \
         baselib_power.o \
         baselib_regconf.o \
         baselib_registry.o \
-       baselib_snglinst.o \
-       baselib_stackwalk.o \
-       baselib_stdpaths.o \
-       baselib_thread.o \
+       baselib_msw_snglinst.o \
+       baselib_msw_stackwalk.o \
+       baselib_msw_stdpaths.o \
+       baselib_msw_thread.o \
         baselib_timer.o \
         baselib_timer.o \
-       baselib_utils.o \
-       baselib_utilsexc.o \
+       baselib_msw_utils.o \
+       baselib_msw_utilsexc.o \
+       baselib_fswatcher.o \
         $(__BASE_WINCE_SRC_OBJECTS_3)
  @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3)
  @COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS_3 = baselib_time.o
         $(__BASE_WINCE_SRC_OBJECTS_3)
  @COND_PLATFORM_WIN32_1@__BASE_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3)
  @COND_TOOLKIT_WINCE@__BASE_WINCE_SRC_OBJECTS_3 = baselib_time.o
@@ -7589,9 +8429,9 @@ COND_PLATFORM_WIN32_1___BASE_PLATFORM_SRC_OBJECTS_3 =  \
  @COND_PLATFORM_WIN32_1@        = baselib_evtloop.o baselib_main.o baselib_mslu.o \
  @COND_PLATFORM_WIN32_1@        baselib_volume.o
  @COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3 \
  @COND_PLATFORM_WIN32_1@        = baselib_evtloop.o baselib_main.o baselib_mslu.o \
  @COND_PLATFORM_WIN32_1@        baselib_volume.o
  @COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3 \
-@COND_TOOLKIT_OSX_CARBON@      = baselib_utils.o baselib_uma.o
+@COND_TOOLKIT_OSX_CARBON@      = baselib_carbon_utils.o baselib_uma.o
  @COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3 \
  @COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3 \
-@COND_TOOLKIT_OSX_COCOA@       = baselib_utils.o
+@COND_TOOLKIT_OSX_COCOA@       = baselib_cocoa_utils.o
  @COND_SHARED_1@____wxbase_namedll_DEP = $(__basedll___depname)
  @COND_SHARED_0@____wxbase_namelib_DEP = $(__baselib___depname)
  COND_MONOLITHIC_0_SHARED_1___netdll___depname = \
  @COND_SHARED_1@____wxbase_namedll_DEP = $(__basedll___depname)
  @COND_SHARED_0@____wxbase_namelib_DEP = $(__baselib___depname)
  COND_MONOLITHIC_0_SHARED_1___netdll___depname = \
@@ -7608,18 +8448,18 @@ COND_PLATFORM_OS2_1___netdll___importlib = -import \
  COND_WINDOWS_IMPLIB_1___netdll___importlib = \
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__netdll___importlib = $(COND_WINDOWS_IMPLIB_1___netdll___importlib)
  COND_WINDOWS_IMPLIB_1___netdll___importlib = \
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__netdll___importlib = $(COND_WINDOWS_IMPLIB_1___netdll___importlib)
-@COND_GCC_PCH_1@__netdll_PCH_INC = -I.pch/wxprec_netdll
-@COND_ICC_PCH_1@__netdll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_netdll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_netdll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_netdll/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__netdll_PCH_INC = -I./.pch/wxprec_netdll
+@COND_ICC_PCH_1@__netdll_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_netdll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_netdll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_netdll/wx/wxprec.h.gch
  COND_USE_SOVERLINUX_1___netdll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_USE_SOVERLINUX_1@__netdll___soname_flags = $(COND_USE_SOVERLINUX_1___netdll___soname_flags)
  COND_USE_SOVERSOLARIS_1___netdll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_USE_SOVERSOLARIS_1@__netdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___netdll___soname_flags)
  COND_USE_SOVERLINUX_1___netdll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_USE_SOVERLINUX_1@__netdll___soname_flags = $(COND_USE_SOVERLINUX_1___netdll___soname_flags)
  COND_USE_SOVERSOLARIS_1___netdll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_USE_SOVERSOLARIS_1@__netdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___netdll___soname_flags)
-COND_USE_SOSYMLINKS_1___netdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+COND_USE_SOTWOSYMLINKS_1___netdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
@@ -7628,8 +8468,14 @@ COND_USE_SOSYMLINKS_1___netdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__netdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___netdll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___netdll___so_symlinks_inst_cmd = rm -f \
+@COND_USE_SOTWOSYMLINKS_1@__netdll___so_symlinks_cmd = $(COND_USE_SOTWOSYMLINKS_1___netdll___so_symlinks_cmd)
+COND_USE_SOVERSOLARIS_1___netdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOVERSOLARIS_1@__netdll___so_symlinks_cmd = $(COND_USE_SOVERSOLARIS_1___netdll___so_symlinks_cmd)
+COND_USE_SOTWOSYMLINKS_1___netdll___so_symlinks_inst_cmd = rm -f \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
@@ -7638,41 +8484,50 @@ COND_USE_SOSYMLINKS_1___netdll___so_symlinks_inst_cmd = rm -f \
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__netdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___netdll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___netdll___so_symlinks_uninst_cmd = rm -f \
+@COND_USE_SOTWOSYMLINKS_1@__netdll___so_symlinks_inst_cmd = $(COND_USE_SOTWOSYMLINKS_1___netdll___so_symlinks_inst_cmd)
+COND_USE_SOVERSOLARIS_1___netdll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX);
+@COND_USE_SOVERSOLARIS_1@__netdll___so_symlinks_inst_cmd = $(COND_USE_SOVERSOLARIS_1___netdll___so_symlinks_inst_cmd)
+COND_USE_SOTWOSYMLINKS_1___netdll___so_symlinks_uninst_cmd = rm -f \
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__netdll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___netdll___so_symlinks_uninst_cmd)
+@COND_USE_SOTWOSYMLINKS_1@__netdll___so_symlinks_uninst_cmd = $(COND_USE_SOTWOSYMLINKS_1___netdll___so_symlinks_uninst_cmd)
+COND_USE_SOVERSOLARIS_1___netdll___so_symlinks_uninst_cmd = rm -f \
+       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOVERSOLARIS_1@__netdll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___netdll___so_symlinks_uninst_cmd)
  @COND_PLATFORM_WIN32_1@__netdll___win32rc = netdll_version_rc.o
  @COND_PLATFORM_WIN32_1@__netdll___win32rc = netdll_version_rc.o
-@COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.o
-@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.o
-@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.o
-COND_PLATFORM_WIN32_1___NET_PLATFORM_SRC_OBJECTS_2 =  \
-       netdll_gsocket.o \
-       netdll_gsockmsw.o \
-       netdll_urlmsw.o \
-       $(__NET_WINCE_SRC_OBJECTS_2)
-@COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_2 = $(COND_PLATFORM_WIN32_1___NET_PLATFORM_SRC_OBJECTS_2)
+@COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_2 \
+@COND_PLATFORM_MACOSX_1@       = netdll_socketiohandler.o netdll_sockunix.o \
+@COND_PLATFORM_MACOSX_1@       netdll_sockosx.o
+@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_sockunix.o
+@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_2 = \
+@COND_PLATFORM_UNIX_1@ netdll_socketiohandler.o netdll_sockunix.o
+@COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_2 \
+@COND_PLATFORM_WIN32_1@        = netdll_sockmsw.o netdll_urlmsw.o \
+@COND_PLATFORM_WIN32_1@        $(__NET_WINCE_SRC_OBJECTS_2)
  @COND_TOOLKIT_WINCE@__NET_WINCE_SRC_OBJECTS_2 = netdll_net.o
  COND_MONOLITHIC_0_SHARED_0___netlib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_MONOLITHIC_0_SHARED_0@__netlib___depname = $(COND_MONOLITHIC_0_SHARED_0___netlib___depname)
  @COND_MONOLITHIC_0_SHARED_0@__install_netlib___depname = install_netlib
  @COND_MONOLITHIC_0_SHARED_0@__uninstall_netlib___depname = uninstall_netlib
  @COND_TOOLKIT_WINCE@__NET_WINCE_SRC_OBJECTS_2 = netdll_net.o
  COND_MONOLITHIC_0_SHARED_0___netlib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_MONOLITHIC_0_SHARED_0@__netlib___depname = $(COND_MONOLITHIC_0_SHARED_0___netlib___depname)
  @COND_MONOLITHIC_0_SHARED_0@__install_netlib___depname = install_netlib
  @COND_MONOLITHIC_0_SHARED_0@__uninstall_netlib___depname = uninstall_netlib
-@COND_GCC_PCH_1@__netlib_PCH_INC = -I.pch/wxprec_netlib
-@COND_ICC_PCH_1@__netlib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_netlib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_netlib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_netlib/wx/wxprec.h.gch
-@COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_gsocket.o
-@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_gsocket.o
-@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_gsocket.o
-COND_PLATFORM_WIN32_1___NET_PLATFORM_SRC_OBJECTS_3 =  \
-       netlib_gsocket.o \
-       netlib_gsockmsw.o \
-       netlib_urlmsw.o \
-       $(__NET_WINCE_SRC_OBJECTS_3)
-@COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_3 = $(COND_PLATFORM_WIN32_1___NET_PLATFORM_SRC_OBJECTS_3)
+@COND_GCC_PCH_1@__netlib_PCH_INC = -I./.pch/wxprec_netlib
+@COND_ICC_PCH_1@__netlib_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_netlib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_netlib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_netlib/wx/wxprec.h.gch
+@COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_3 \
+@COND_PLATFORM_MACOSX_1@       = netlib_socketiohandler.o netlib_sockunix.o \
+@COND_PLATFORM_MACOSX_1@       netlib_sockosx.o
+@COND_PLATFORM_OS2_1@__NET_PLATFORM_SRC_OBJECTS_3 = netlib_sockunix.o
+@COND_PLATFORM_UNIX_1@__NET_PLATFORM_SRC_OBJECTS_3 = \
+@COND_PLATFORM_UNIX_1@ netlib_socketiohandler.o netlib_sockunix.o
+@COND_PLATFORM_WIN32_1@__NET_PLATFORM_SRC_OBJECTS_3 \
+@COND_PLATFORM_WIN32_1@        = netlib_sockmsw.o netlib_urlmsw.o \
+@COND_PLATFORM_WIN32_1@        $(__NET_WINCE_SRC_OBJECTS_3)
  @COND_TOOLKIT_WINCE@__NET_WINCE_SRC_OBJECTS_3 = netlib_net.o
  @COND_SHARED_1@____wxnet_namedll_DEP = $(__netdll___depname)
  @COND_SHARED_0@____wxnet_namelib_DEP = $(__netlib___depname)
  @COND_TOOLKIT_WINCE@__NET_WINCE_SRC_OBJECTS_3 = netlib_net.o
  @COND_SHARED_1@____wxnet_namedll_DEP = $(__netdll___depname)
  @COND_SHARED_0@____wxnet_namelib_DEP = $(__netlib___depname)
@@ -7692,18 +8547,19 @@ COND_PLATFORM_OS2_1___coredll___importlib = -import \
  COND_WINDOWS_IMPLIB_1___coredll___importlib = \
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__coredll___importlib = $(COND_WINDOWS_IMPLIB_1___coredll___importlib)
  COND_WINDOWS_IMPLIB_1___coredll___importlib = \
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__coredll___importlib = $(COND_WINDOWS_IMPLIB_1___coredll___importlib)
-@COND_GCC_PCH_1@__coredll_PCH_INC = -I.pch/wxprec_coredll
-@COND_ICC_PCH_1@__coredll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_coredll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_coredll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_coredll/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__coredll_PCH_INC = -I./.pch/wxprec_coredll
+@COND_ICC_PCH_1@__coredll_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_coredll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_coredll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_coredll/wx/wxprec.h.gch
  COND_USE_SOVERLINUX_1___coredll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_USE_SOVERLINUX_1@__coredll___soname_flags = $(COND_USE_SOVERLINUX_1___coredll___soname_flags)
  COND_USE_SOVERSOLARIS_1___coredll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_USE_SOVERSOLARIS_1@__coredll___soname_flags = $(COND_USE_SOVERSOLARIS_1___coredll___soname_flags)
  COND_USE_SOVERLINUX_1___coredll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_USE_SOVERLINUX_1@__coredll___soname_flags = $(COND_USE_SOVERLINUX_1___coredll___soname_flags)
  COND_USE_SOVERSOLARIS_1___coredll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_USE_SOVERSOLARIS_1@__coredll___soname_flags = $(COND_USE_SOVERSOLARIS_1___coredll___soname_flags)
-COND_USE_SOSYMLINKS_1___coredll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+COND_USE_SOTWOSYMLINKS_1___coredll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm \
+       -f \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
@@ -7712,8 +8568,14 @@ COND_USE_SOSYMLINKS_1___coredll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__coredll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___coredll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___coredll___so_symlinks_inst_cmd = rm -f \
+@COND_USE_SOTWOSYMLINKS_1@__coredll___so_symlinks_cmd = $(COND_USE_SOTWOSYMLINKS_1___coredll___so_symlinks_cmd)
+COND_USE_SOVERSOLARIS_1___coredll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOVERSOLARIS_1@__coredll___so_symlinks_cmd = $(COND_USE_SOVERSOLARIS_1___coredll___so_symlinks_cmd)
+COND_USE_SOTWOSYMLINKS_1___coredll___so_symlinks_inst_cmd = rm -f \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
@@ -7722,20 +8584,29 @@ COND_USE_SOSYMLINKS_1___coredll___so_symlinks_inst_cmd = rm -f \
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__coredll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___coredll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___coredll___so_symlinks_uninst_cmd = rm -f \
+@COND_USE_SOTWOSYMLINKS_1@__coredll___so_symlinks_inst_cmd = $(COND_USE_SOTWOSYMLINKS_1___coredll___so_symlinks_inst_cmd)
+COND_USE_SOVERSOLARIS_1___coredll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX);
+@COND_USE_SOVERSOLARIS_1@__coredll___so_symlinks_inst_cmd = $(COND_USE_SOVERSOLARIS_1___coredll___so_symlinks_inst_cmd)
+COND_USE_SOTWOSYMLINKS_1___coredll___so_symlinks_uninst_cmd = rm -f \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__coredll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___coredll___so_symlinks_uninst_cmd)
+@COND_USE_SOTWOSYMLINKS_1@__coredll___so_symlinks_uninst_cmd = $(COND_USE_SOTWOSYMLINKS_1___coredll___so_symlinks_uninst_cmd)
+COND_USE_SOVERSOLARIS_1___coredll___so_symlinks_uninst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOVERSOLARIS_1@__coredll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___coredll___so_symlinks_uninst_cmd)
  @COND_PLATFORM_WIN32_1@__coredll___win32rc = coredll_version_rc.o
  @COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4 = 
  @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4 \
  @COND_PLATFORM_WIN32_1@__coredll___win32rc = coredll_version_rc.o
  @COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4 = 
  @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4 \
-@COND_PLATFORM_WIN32_1@        = coredll_evtloop.o coredll_main.o coredll_mslu.o \
-@COND_PLATFORM_WIN32_1@        coredll_volume.o
+@COND_PLATFORM_WIN32_1@        = coredll_msw_evtloop.o coredll_msw_main.o \
+@COND_PLATFORM_WIN32_1@        coredll_mslu.o coredll_volume.o
  @COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4 \
  @COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4 \
-@COND_TOOLKIT_OSX_CARBON@      = coredll_utils.o coredll_uma.o
+@COND_TOOLKIT_OSX_CARBON@      = coredll_carbon_utils.o coredll_uma.o
  @COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4 \
  @COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4 \
-@COND_TOOLKIT_OSX_COCOA@       = coredll_utils.o
+@COND_TOOLKIT_OSX_COCOA@       = coredll_osx_cocoa_utils.o
  COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
         $(__LOWLEVEL_SRC_OBJECTS_4) \
         $(__PLATFORM_SRC_OBJECTS_8) \
  COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
         $(__LOWLEVEL_SRC_OBJECTS_4) \
         $(__PLATFORM_SRC_OBJECTS_8) \
@@ -7743,17 +8614,23 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
         coredll_accelcmn.o \
         coredll_accesscmn.o \
         coredll_anidecod.o \
         coredll_accelcmn.o \
         coredll_accesscmn.o \
         coredll_anidecod.o \
+       coredll_affinematrix2d.o \
         coredll_appcmn.o \
         coredll_artprov.o \
         coredll_artstd.o \
         coredll_appcmn.o \
         coredll_artprov.o \
         coredll_artstd.o \
+       coredll_arttango.o \
         coredll_bmpbase.o \
         coredll_bmpbase.o \
+       coredll_bmpbtncmn.o \
         coredll_bookctrl.o \
         coredll_btncmn.o \
         coredll_cairo.o \
         coredll_bookctrl.o \
         coredll_btncmn.o \
         coredll_cairo.o \
+       coredll_checkboxcmn.o \
+       coredll_checklstcmn.o \
         coredll_choiccmn.o \
         coredll_clipcmn.o \
         coredll_clrpickercmn.o \
         coredll_colourcmn.o \
         coredll_choiccmn.o \
         coredll_clipcmn.o \
         coredll_clrpickercmn.o \
         coredll_colourcmn.o \
+       coredll_colourdata.o \
         coredll_combocmn.o \
         coredll_cmdproc.o \
         coredll_cmndata.o \
         coredll_combocmn.o \
         coredll_cmdproc.o \
         coredll_cmndata.o \
@@ -7761,11 +8638,11 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
         coredll_cshelp.o \
         coredll_ctrlcmn.o \
         coredll_ctrlsub.o \
         coredll_cshelp.o \
         coredll_ctrlcmn.o \
         coredll_ctrlsub.o \
-       coredll_datacmn.o \
         coredll_dcbase.o \
         coredll_dcbufcmn.o \
         coredll_dcgraph.o \
         coredll_dcsvg.o \
         coredll_dcbase.o \
         coredll_dcbufcmn.o \
         coredll_dcgraph.o \
         coredll_dcsvg.o \
+       coredll_dirctrlcmn.o \
         coredll_dlgcmn.o \
         coredll_dndcmn.o \
         coredll_dobjcmn.o \
         coredll_dlgcmn.o \
         coredll_dndcmn.o \
         coredll_dobjcmn.o \
@@ -7776,10 +8653,13 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
         coredll_effects.o \
         coredll_fddlgcmn.o \
         coredll_filectrlcmn.o \
         coredll_effects.o \
         coredll_fddlgcmn.o \
         coredll_filectrlcmn.o \
+       coredll_filehistorycmn.o \
         coredll_filepickercmn.o \
         coredll_fontpickercmn.o \
         coredll_fldlgcmn.o \
         coredll_fontcmn.o \
         coredll_filepickercmn.o \
         coredll_fontpickercmn.o \
         coredll_fldlgcmn.o \
         coredll_fontcmn.o \
+       coredll_fontdata.o \
+       coredll_graphicc.o \
         coredll_fontenumcmn.o \
         coredll_fontmap.o \
         coredll_fontutilcmn.o \
         coredll_fontenumcmn.o \
         coredll_fontmap.o \
         coredll_fontutilcmn.o \
@@ -7790,6 +8670,8 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
         coredll_geometry.o \
         coredll_gifdecod.o \
         coredll_graphcmn.o \
         coredll_geometry.o \
         coredll_gifdecod.o \
         coredll_graphcmn.o \
+       coredll_headercolcmn.o \
+       coredll_headerctrlcmn.o \
         coredll_helpbase.o \
         coredll_iconbndl.o \
         coredll_imagall.o \
         coredll_helpbase.o \
         coredll_iconbndl.o \
         coredll_imagall.o \
@@ -7808,22 +8690,36 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
         coredll_layout.o \
         coredll_lboxcmn.o \
         coredll_listctrlcmn.o \
         coredll_layout.o \
         coredll_lboxcmn.o \
         coredll_listctrlcmn.o \
+       coredll_markupparser.o \
         coredll_matrix.o \
         coredll_menucmn.o \
         coredll_matrix.o \
         coredll_menucmn.o \
+       coredll_mousemanager.o \
         coredll_nbkbase.o \
         coredll_overlaycmn.o \
         coredll_nbkbase.o \
         coredll_overlaycmn.o \
+       coredll_ownerdrwcmn.o \
         coredll_paper.o \
         coredll_paper.o \
+       coredll_panelcmn.o \
+       coredll_persist.o \
         coredll_pickerbase.o \
         coredll_popupcmn.o \
         coredll_prntbase.o \
         coredll_quantize.o \
         coredll_pickerbase.o \
         coredll_popupcmn.o \
         coredll_prntbase.o \
         coredll_quantize.o \
+       coredll_radiobtncmn.o \
         coredll_radiocmn.o \
         coredll_radiocmn.o \
+       coredll_rearrangectrl.o \
         coredll_rendcmn.o \
         coredll_rgncmn.o \
         coredll_rendcmn.o \
         coredll_rgncmn.o \
+       coredll_scrolbarcmn.o \
         coredll_settcmn.o \
         coredll_sizer.o \
         coredll_settcmn.o \
         coredll_sizer.o \
+       coredll_slidercmn.o \
+       coredll_spinbtncmn.o \
+       coredll_spinctrlcmn.o \
         coredll_srchcmn.o \
         coredll_statbar.o \
         coredll_srchcmn.o \
         coredll_statbar.o \
+       coredll_statbmpcmn.o \
+       coredll_statboxcmn.o \
+       coredll_statlinecmn.o \
         coredll_stattextcmn.o \
         coredll_stockitem.o \
         coredll_tbarbase.o \
         coredll_stattextcmn.o \
         coredll_stockitem.o \
         coredll_tbarbase.o \
@@ -7831,9 +8727,11 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
         coredll_textentrycmn.o \
         coredll_toplvcmn.o \
         coredll_treebase.o \
         coredll_textentrycmn.o \
         coredll_toplvcmn.o \
         coredll_treebase.o \
+       coredll_uiactioncmn.o \
         coredll_valgen.o \
         coredll_validate.o \
         coredll_valtext.o \
         coredll_valgen.o \
         coredll_validate.o \
         coredll_valtext.o \
+       coredll_valnum.o \
         coredll_wincmn.o \
         coredll_windowid.o \
         coredll_wrapsizer.o \
         coredll_wincmn.o \
         coredll_windowid.o \
         coredll_wrapsizer.o \
@@ -7847,19 +8745,25 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
         coredll_dirctrlg.o \
         coredll_dragimgg.o \
         coredll_filectrlg.o \
         coredll_dirctrlg.o \
         coredll_dragimgg.o \
         coredll_filectrlg.o \
+       coredll_headerctrlg.o \
+       coredll_generic_infobar.o \
         coredll_listbkg.o \
         coredll_logg.o \
         coredll_listbkg.o \
         coredll_logg.o \
+       coredll_markuptext.o \
+       coredll_msgdlgg.o \
         coredll_numdlgg.o \
         coredll_panelg.o \
         coredll_progdlgg.o \
         coredll_printps.o \
         coredll_renderg.o \
         coredll_numdlgg.o \
         coredll_panelg.o \
         coredll_progdlgg.o \
         coredll_printps.o \
         coredll_renderg.o \
+       coredll_richmsgdlgg.o \
         coredll_scrlwing.o \
         coredll_selstore.o \
         coredll_spinctlg.o \
         coredll_splitter.o \
         coredll_srchctlg.o \
         coredll_statbmpg.o \
         coredll_scrlwing.o \
         coredll_selstore.o \
         coredll_spinctlg.o \
         coredll_splitter.o \
         coredll_srchctlg.o \
         coredll_statbmpg.o \
+       coredll_stattextg.o \
         coredll_textdlgg.o \
         coredll_tipwin.o \
         coredll_toolbkg.o \
         coredll_textdlgg.o \
         coredll_tipwin.o \
         coredll_toolbkg.o \
@@ -7871,55 +8775,53 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
  COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
         $(__LOWLEVEL_SRC_OBJECTS_5) \
         $(__PLATFORM_SRC_OBJECTS_8) \
  COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
         $(__LOWLEVEL_SRC_OBJECTS_5) \
         $(__PLATFORM_SRC_OBJECTS_8) \
-       coredll_accel.o \
+       coredll_generic_accel.o \
         coredll_clrpickerg.o \
         coredll_collpaneg.o \
         coredll_colrdlgg.o \
         coredll_dirdlgg.o \
         coredll_clrpickerg.o \
         coredll_collpaneg.o \
         coredll_colrdlgg.o \
         coredll_dirdlgg.o \
-       coredll_fdrepdlg.o \
+       coredll_generic_fdrepdlg.o \
         coredll_filedlgg.o \
         coredll_filepickerg.o \
         coredll_fontdlgg.o \
         coredll_fontpickerg.o \
         coredll_filedlgg.o \
         coredll_filepickerg.o \
         coredll_fontdlgg.o \
         coredll_fontpickerg.o \
-       coredll_listctrl.o \
+       coredll_generic_listctrl.o \
         coredll_mdig.o \
         coredll_mdig.o \
-       coredll_msgdlgg.o \
         coredll_prntdlgg.o \
         coredll_prntdlgg.o \
-       coredll_tabg.o \
-       coredll_bmpbuttn.o \
-       coredll_button.o \
-       coredll_checkbox.o \
-       coredll_checklst.o \
-       coredll_choice.o \
-       coredll_combobox.o \
-       coredll_control.o \
+       coredll_univ_bmpbuttn.o \
+       coredll_univ_button.o \
+       coredll_univ_checkbox.o \
+       coredll_univ_checklst.o \
+       coredll_univ_choice.o \
+       coredll_univ_combobox.o \
+       coredll_univ_control.o \
         coredll_ctrlrend.o \
         coredll_ctrlrend.o \
-       coredll_dialog.o \
+       coredll_univ_dialog.o \
         coredll_framuniv.o \
         coredll_framuniv.o \
-       coredll_gauge.o \
+       coredll_univ_gauge.o \
         coredll_inpcons.o \
         coredll_inphand.o \
         coredll_inpcons.o \
         coredll_inphand.o \
-       coredll_listbox.o \
-       coredll_menu.o \
-       coredll_notebook.o \
-       coredll_radiobox.o \
-       coredll_radiobut.o \
+       coredll_univ_listbox.o \
+       coredll_univ_menu.o \
+       coredll_univ_notebook.o \
+       coredll_univ_radiobox.o \
+       coredll_univ_radiobut.o \
         coredll_scrarrow.o \
         coredll_scrarrow.o \
-       coredll_scrolbar.o \
+       coredll_univ_scrolbar.o \
         coredll_scrthumb.o \
         coredll_settingsuniv.o \
         coredll_scrthumb.o \
         coredll_settingsuniv.o \
-       coredll_slider.o \
-       coredll_spinbutt.o \
-       coredll_statbmp.o \
-       coredll_statbox.o \
-       coredll_statline.o \
-       coredll_stattext.o \
-       coredll_statusbr.o \
+       coredll_univ_slider.o \
+       coredll_univ_spinbutt.o \
+       coredll_univ_statbmp.o \
+       coredll_univ_statbox.o \
+       coredll_univ_statline.o \
+       coredll_univ_stattext.o \
+       coredll_univ_statusbr.o \
         coredll_stdrend.o \
         coredll_stdrend.o \
-       coredll_textctrl.o \
-       coredll_tglbtn.o \
+       coredll_univ_textctrl.o \
+       coredll_univ_tglbtn.o \
         coredll_theme.o \
         coredll_theme.o \
-       coredll_toolbar.o \
+       coredll_univ_toolbar.o \
         coredll_topluniv.o \
         coredll_winuniv.o \
         coredll_gtk.o \
         coredll_topluniv.o \
         coredll_winuniv.o \
         coredll_gtk.o \
@@ -7929,17 +8831,23 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
         coredll_accelcmn.o \
         coredll_accesscmn.o \
         coredll_anidecod.o \
         coredll_accelcmn.o \
         coredll_accesscmn.o \
         coredll_anidecod.o \
+       coredll_affinematrix2d.o \
         coredll_appcmn.o \
         coredll_artprov.o \
         coredll_artstd.o \
         coredll_appcmn.o \
         coredll_artprov.o \
         coredll_artstd.o \
+       coredll_arttango.o \
         coredll_bmpbase.o \
         coredll_bmpbase.o \
+       coredll_bmpbtncmn.o \
         coredll_bookctrl.o \
         coredll_btncmn.o \
         coredll_cairo.o \
         coredll_bookctrl.o \
         coredll_btncmn.o \
         coredll_cairo.o \
+       coredll_checkboxcmn.o \
+       coredll_checklstcmn.o \
         coredll_choiccmn.o \
         coredll_clipcmn.o \
         coredll_clrpickercmn.o \
         coredll_colourcmn.o \
         coredll_choiccmn.o \
         coredll_clipcmn.o \
         coredll_clrpickercmn.o \
         coredll_colourcmn.o \
+       coredll_colourdata.o \
         coredll_combocmn.o \
         coredll_cmdproc.o \
         coredll_cmndata.o \
         coredll_combocmn.o \
         coredll_cmdproc.o \
         coredll_cmndata.o \
@@ -7947,11 +8855,11 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
         coredll_cshelp.o \
         coredll_ctrlcmn.o \
         coredll_ctrlsub.o \
         coredll_cshelp.o \
         coredll_ctrlcmn.o \
         coredll_ctrlsub.o \
-       coredll_datacmn.o \
         coredll_dcbase.o \
         coredll_dcbufcmn.o \
         coredll_dcgraph.o \
         coredll_dcsvg.o \
         coredll_dcbase.o \
         coredll_dcbufcmn.o \
         coredll_dcgraph.o \
         coredll_dcsvg.o \
+       coredll_dirctrlcmn.o \
         coredll_dlgcmn.o \
         coredll_dndcmn.o \
         coredll_dobjcmn.o \
         coredll_dlgcmn.o \
         coredll_dndcmn.o \
         coredll_dobjcmn.o \
@@ -7962,10 +8870,13 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
         coredll_effects.o \
         coredll_fddlgcmn.o \
         coredll_filectrlcmn.o \
         coredll_effects.o \
         coredll_fddlgcmn.o \
         coredll_filectrlcmn.o \
+       coredll_filehistorycmn.o \
         coredll_filepickercmn.o \
         coredll_fontpickercmn.o \
         coredll_fldlgcmn.o \
         coredll_fontcmn.o \
         coredll_filepickercmn.o \
         coredll_fontpickercmn.o \
         coredll_fldlgcmn.o \
         coredll_fontcmn.o \
+       coredll_fontdata.o \
+       coredll_graphicc.o \
         coredll_fontenumcmn.o \
         coredll_fontmap.o \
         coredll_fontutilcmn.o \
         coredll_fontenumcmn.o \
         coredll_fontmap.o \
         coredll_fontutilcmn.o \
@@ -7976,6 +8887,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
         coredll_geometry.o \
         coredll_gifdecod.o \
         coredll_graphcmn.o \
         coredll_geometry.o \
         coredll_gifdecod.o \
         coredll_graphcmn.o \
+       coredll_headercolcmn.o \
+       coredll_headerctrlcmn.o \
         coredll_helpbase.o \
         coredll_iconbndl.o \
         coredll_imagall.o \
         coredll_helpbase.o \
         coredll_iconbndl.o \
         coredll_imagall.o \
@@ -7994,22 +8907,36 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
         coredll_layout.o \
         coredll_lboxcmn.o \
         coredll_listctrlcmn.o \
         coredll_layout.o \
         coredll_lboxcmn.o \
         coredll_listctrlcmn.o \
+       coredll_markupparser.o \
         coredll_matrix.o \
         coredll_menucmn.o \
         coredll_matrix.o \
         coredll_menucmn.o \
+       coredll_mousemanager.o \
         coredll_nbkbase.o \
         coredll_overlaycmn.o \
         coredll_nbkbase.o \
         coredll_overlaycmn.o \
+       coredll_ownerdrwcmn.o \
         coredll_paper.o \
         coredll_paper.o \
+       coredll_panelcmn.o \
+       coredll_persist.o \
         coredll_pickerbase.o \
         coredll_popupcmn.o \
         coredll_prntbase.o \
         coredll_quantize.o \
         coredll_pickerbase.o \
         coredll_popupcmn.o \
         coredll_prntbase.o \
         coredll_quantize.o \
+       coredll_radiobtncmn.o \
         coredll_radiocmn.o \
         coredll_radiocmn.o \
+       coredll_rearrangectrl.o \
         coredll_rendcmn.o \
         coredll_rgncmn.o \
         coredll_rendcmn.o \
         coredll_rgncmn.o \
+       coredll_scrolbarcmn.o \
         coredll_settcmn.o \
         coredll_sizer.o \
         coredll_settcmn.o \
         coredll_sizer.o \
+       coredll_slidercmn.o \
+       coredll_spinbtncmn.o \
+       coredll_spinctrlcmn.o \
         coredll_srchcmn.o \
         coredll_statbar.o \
         coredll_srchcmn.o \
         coredll_statbar.o \
+       coredll_statbmpcmn.o \
+       coredll_statboxcmn.o \
+       coredll_statlinecmn.o \
         coredll_stattextcmn.o \
         coredll_stockitem.o \
         coredll_tbarbase.o \
         coredll_stattextcmn.o \
         coredll_stockitem.o \
         coredll_tbarbase.o \
@@ -8017,9 +8944,11 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
         coredll_textentrycmn.o \
         coredll_toplvcmn.o \
         coredll_treebase.o \
         coredll_textentrycmn.o \
         coredll_toplvcmn.o \
         coredll_treebase.o \
+       coredll_uiactioncmn.o \
         coredll_valgen.o \
         coredll_validate.o \
         coredll_valtext.o \
         coredll_valgen.o \
         coredll_validate.o \
         coredll_valtext.o \
+       coredll_valnum.o \
         coredll_wincmn.o \
         coredll_windowid.o \
         coredll_wrapsizer.o \
         coredll_wincmn.o \
         coredll_windowid.o \
         coredll_wrapsizer.o \
@@ -8033,19 +8962,25 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
         coredll_dirctrlg.o \
         coredll_dragimgg.o \
         coredll_filectrlg.o \
         coredll_dirctrlg.o \
         coredll_dragimgg.o \
         coredll_filectrlg.o \
+       coredll_headerctrlg.o \
+       coredll_generic_infobar.o \
         coredll_listbkg.o \
         coredll_logg.o \
         coredll_listbkg.o \
         coredll_logg.o \
+       coredll_markuptext.o \
+       coredll_msgdlgg.o \
         coredll_numdlgg.o \
         coredll_panelg.o \
         coredll_progdlgg.o \
         coredll_printps.o \
         coredll_renderg.o \
         coredll_numdlgg.o \
         coredll_panelg.o \
         coredll_progdlgg.o \
         coredll_printps.o \
         coredll_renderg.o \
+       coredll_richmsgdlgg.o \
         coredll_scrlwing.o \
         coredll_selstore.o \
         coredll_spinctlg.o \
         coredll_splitter.o \
         coredll_srchctlg.o \
         coredll_statbmpg.o \
         coredll_scrlwing.o \
         coredll_selstore.o \
         coredll_spinctlg.o \
         coredll_splitter.o \
         coredll_srchctlg.o \
         coredll_statbmpg.o \
+       coredll_stattextg.o \
         coredll_textdlgg.o \
         coredll_tipwin.o \
         coredll_toolbkg.o \
         coredll_textdlgg.o \
         coredll_tipwin.o \
         coredll_toolbkg.o \
@@ -8058,299 +8993,309 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
  @COND_TOOLKIT_COCOA@   coredll_hid.o coredll_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_4 =  \
         coredll_fontmgrcmn.o \
  @COND_TOOLKIT_COCOA@   coredll_hid.o coredll_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_4 =  \
         coredll_fontmgrcmn.o \
-       coredll_caret.o \
-       coredll_colour.o \
-       coredll_icon.o \
-       coredll_imaglist.o \
+       coredll_generic_caret.o \
+       coredll_generic_colour.o \
+       coredll_generic_icon.o \
+       coredll_generic_imaglist.o \
         coredll_mask.o \
         coredll_mask.o \
-       coredll_timer.o \
-       coredll_app.o \
-       coredll_bitmap.o \
-       coredll_brush.o \
-       coredll_cursor.o \
-       coredll_dc.o \
-       coredll_dcclient.o \
-       coredll_dcmemory.o \
-       coredll_dcscreen.o \
-       coredll_evtloop.o \
-       coredll_font.o \
-       coredll_fontenum.o \
-       coredll_fontmgr.o \
-       coredll_nonownedwnd.o \
-       coredll_overlay.o \
-       coredll_pen.o \
-       coredll_region.o \
-       coredll_settings.o \
-       coredll_toplevel.o \
-       coredll_utils.o \
-       coredll_window.o \
+       coredll_dfb_app.o \
+       coredll_dfb_bitmap.o \
+       coredll_dfb_brush.o \
+       coredll_dfb_cursor.o \
+       coredll_dfb_dc.o \
+       coredll_dfb_dcclient.o \
+       coredll_dfb_dcmemory.o \
+       coredll_dfb_dcscreen.o \
+       coredll_dfb_evtloop.o \
+       coredll_dfb_font.o \
+       coredll_dfb_fontenum.o \
+       coredll_dfb_fontmgr.o \
+       coredll_dfb_nonownedwnd.o \
+       coredll_dfb_overlay.o \
+       coredll_dfb_pen.o \
+       coredll_dfb_region.o \
+       coredll_dfb_settings.o \
+       coredll_dfb_toplevel.o \
+       coredll_dfb_utils.o \
+       coredll_dfb_window.o \
         coredll_wrapdfb.o
  @COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_4)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_4 =  \
         coredll_wrapdfb.o
  @COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_4)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_4 =  \
-       coredll_caret.o \
-       coredll_imaglist.o \
-       coredll_dialup.o \
-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_utilsx11.o \
+       coredll_generic_caret.o \
+       coredll_generic_imaglist.o \
+       coredll_unix_dialup.o \
         coredll_displayx11.o \
         coredll_displayx11.o \
-       coredll_icon.o \
+       coredll_unix_fontenum.o \
+       coredll_unix_fontutil.o \
+       coredll_uiactionx11.o \
+       coredll_utilsx11.o \
+       coredll_generic_icon.o \
         coredll_paletteg.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_gsockgtk.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
+       coredll_gtk1_app.o \
+       coredll_gtk1_bitmap.o \
+       coredll_gtk1_brush.o \
+       coredll_gtk1_clipbrd.o \
+       coredll_gtk1_colour.o \
+       coredll_gtk1_cursor.o \
+       coredll_gtk1_data.o \
+       coredll_gtk1_dataobj.o \
+       coredll_gtk1_dc.o \
+       coredll_gtk1_dcclient.o \
+       coredll_gtk1_dcmemory.o \
+       coredll_gtk1_dcscreen.o \
+       coredll_gtk1_dnd.o \
+       coredll_gtk1_evtloop.o \
+       coredll_gtk1_font.o \
+       coredll_gtk1_sockgtk.o \
+       coredll_gtk1_main.o \
+       coredll_gtk1_minifram.o \
+       coredll_gtk1_pen.o \
+       coredll_gtk1_popupwin.o \
+       coredll_gtk1_region.o \
+       coredll_gtk1_renderer.o \
+       coredll_gtk1_settings.o \
+       coredll_gtk1_timer.o \
+       coredll_gtk1_tooltip.o \
+       coredll_gtk1_toplevel.o \
+       coredll_gtk1_utilsgtk.o \
+       coredll_gtk1_win_gtk.o \
+       coredll_gtk1_window.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_4)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_4 =  \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_4)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_4 =  \
-       coredll_caret.o \
-       coredll_imaglist.o \
-       coredll_dialup.o \
-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_utilsx11.o \
+       coredll_generic_caret.o \
+       coredll_generic_imaglist.o \
+       coredll_unix_dialup.o \
         coredll_displayx11.o \
         coredll_displayx11.o \
-       coredll_icon.o \
+       coredll_unix_fontenum.o \
+       coredll_unix_fontutil.o \
+       coredll_uiactionx11.o \
+       coredll_utilsx11.o \
+       coredll_generic_icon.o \
         coredll_paletteg.o \
         coredll_paletteg.o \
-       coredll_app.o \
+       coredll_gtk_app.o \
         coredll_assertdlg_gtk.o \
         coredll_assertdlg_gtk.o \
-       coredll_bitmap.o \
-       coredll_brush.o \
-       coredll_clipbrd.o \
-       coredll_colour.o \
-       coredll_cursor.o \
-       coredll_dataobj.o \
-       coredll_dc.o \
-       coredll_dcclient.o \
-       coredll_dcmemory.o \
-       coredll_dcscreen.o \
-       coredll_dnd.o \
-       coredll_evtloop.o \
+       coredll_gtk_bitmap.o \
+       coredll_gtk_brush.o \
+       coredll_gtk_clipbrd.o \
+       coredll_gtk_colour.o \
+       coredll_gtk_cursor.o \
+       coredll_gtk_dataobj.o \
+       coredll_gtk_dc.o \
+       coredll_gtk_dcclient.o \
+       coredll_gtk_dcmemory.o \
+       coredll_gtk_dcscreen.o \
+       coredll_gtk_dnd.o \
+       coredll_gtk_evtloop.o \
         coredll_filectrl.o \
         coredll_filectrl.o \
-       coredll_font.o \
-       coredll_gsockgtk.o \
-       coredll_minifram.o \
-       coredll_pen.o \
-       coredll_popupwin.o \
+       coredll_filehistory.o \
+       coredll_gtk_font.o \
+       coredll_gtk_sockgtk.o \
+       coredll_gtk_minifram.o \
+       coredll_gtk_pen.o \
+       coredll_gtk_popupwin.o \
         coredll_private.o \
         coredll_private.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
+       coredll_gtk_region.o \
+       coredll_gtk_renderer.o \
+       coredll_gtk_settings.o \
+       coredll_gtk_timer.o \
+       coredll_gtk_tooltip.o \
+       coredll_gtk_toplevel.o \
+       coredll_gtk_utilsgtk.o \
+       coredll_gtk_win_gtk.o \
+       coredll_gtk_window.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_4)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_4 =  \
         coredll_fontmgrcmn.o \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_4)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_4 =  \
         coredll_fontmgrcmn.o \
-       coredll_caret.o \
-       coredll_colour.o \
-       coredll_icon.o \
-       coredll_imaglist.o \
+       coredll_generic_caret.o \
+       coredll_generic_colour.o \
+       coredll_generic_icon.o \
+       coredll_generic_imaglist.o \
         coredll_mask.o \
         coredll_mask.o \
-       coredll_timer.o \
-       coredll_app.o \
-       coredll_bitmap.o \
-       coredll_brush.o \
-       coredll_clipbrd.o \
-       coredll_cursor.o \
-       coredll_data.o \
-       coredll_dc.o \
-       coredll_dcclient.o \
-       coredll_dcmemory.o \
-       coredll_dcscreen.o \
+       coredll_generic_timer.o \
+       coredll_mgl_app.o \
+       coredll_mgl_bitmap.o \
+       coredll_mgl_brush.o \
+       coredll_mgl_clipbrd.o \
+       coredll_mgl_cursor.o \
+       coredll_mgl_data.o \
+       coredll_mgl_dc.o \
+       coredll_mgl_dcclient.o \
+       coredll_mgl_dcmemory.o \
+       coredll_mgl_dcscreen.o \
         coredll_dirmgl.o \
         coredll_dirmgl.o \
-       coredll_evtloop.o \
-       coredll_font.o \
-       coredll_fontenum.o \
-       coredll_fontmgr.o \
-       coredll_fontutil.o \
-       coredll_palette.o \
-       coredll_pen.o \
-       coredll_region.o \
-       coredll_settings.o \
-       coredll_toplevel.o \
-       coredll_utils.o \
-       coredll_window.o
+       coredll_mgl_evtloop.o \
+       coredll_mgl_font.o \
+       coredll_mgl_fontenum.o \
+       coredll_mgl_fontmgr.o \
+       coredll_mgl_fontutil.o \
+       coredll_mgl_palette.o \
+       coredll_mgl_pen.o \
+       coredll_mgl_region.o \
+       coredll_mgl_settings.o \
+       coredll_mgl_toplevel.o \
+       coredll_mgl_utils.o \
+       coredll_mgl_window.o
  @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_4)
  COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_4 =  \
  @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_imaglist.o \
-       coredll_dialup.o \
-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_utilsx11.o \
+       coredll_generic_caret.o \
+       coredll_generic_imaglist.o \
+       coredll_unix_dialup.o \
         coredll_displayx11.o \
         coredll_displayx11.o \
-       coredll_bitmap.o \
-       coredll_brush.o \
-       coredll_palette.o \
-       coredll_pen.o \
-       coredll_region.o \
+       coredll_unix_fontenum.o \
+       coredll_unix_fontutil.o \
+       coredll_uiactionx11.o \
+       coredll_utilsx11.o \
+       coredll_x11_bitmap.o \
+       coredll_x11_brush.o \
+       coredll_x11_palette.o \
+       coredll_x11_pen.o \
+       coredll_x11_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_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_activex.o \
+       coredll_msw_app.o \
+       coredll_msw_bitmap.o \
+       coredll_msw_brush.o \
+       coredll_msw_caret.o \
+       coredll_msw_clipbrd.o \
+       coredll_msw_colour.o \
+       coredll_msw_cursor.o \
+       coredll_msw_data.o \
+       coredll_msw_dc.o \
+       coredll_msw_dcclient.o \
+       coredll_msw_dcmemory.o \
+       coredll_msw_dcprint.o \
+       coredll_msw_dcscreen.o \
+       coredll_msw_dialup.o \
         coredll_dib.o \
         coredll_dib.o \
-       coredll_display.o \
+       coredll_msw_display.o \
         coredll_enhmeta.o \
         coredll_enhmeta.o \
-       coredll_font.o \
-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_gdiimage.o \
-       coredll_gdiobj.o \
+       coredll_msw_font.o \
+       coredll_msw_fontenum.o \
+       coredll_msw_fontutil.o \
+       coredll_msw_gdiimage.o \
+       coredll_msw_gdiobj.o \
         coredll_gdiplus.o \
         coredll_gdiplus.o \
-       coredll_graphics.o \
-       coredll_icon.o \
-       coredll_imaglist.o \
-       coredll_minifram.o \
-       coredll_dataobj.o \
+       coredll_msw_graphics.o \
+       coredll_msw_icon.o \
+       coredll_msw_imaglist.o \
+       coredll_msw_minifram.o \
+       coredll_ole_dataobj.o \
         coredll_dropsrc.o \
         coredll_droptgt.o \
         coredll_oleutils.o \
         coredll_dropsrc.o \
         coredll_droptgt.o \
         coredll_oleutils.o \
-       coredll_palette.o \
-       coredll_pen.o \
-       coredll_popupwin.o \
-       coredll_printdlg.o \
+       coredll_msw_palette.o \
+       coredll_msw_pen.o \
+       coredll_msw_popupwin.o \
+       coredll_msw_printdlg.o \
         coredll_printwin.o \
         coredll_printwin.o \
-       coredll_region.o \
-       coredll_renderer.o \
-       coredll_settings.o \
-       coredll_tooltip.o \
-       coredll_toplevel.o \
-       coredll_utilsgui.o \
+       coredll_msw_region.o \
+       coredll_msw_renderer.o \
+       coredll_msw_settings.o \
+       coredll_msw_tooltip.o \
+       coredll_msw_toplevel.o \
+       coredll_uiaction.o \
+       coredll_msw_utilsgui.o \
         coredll_uxtheme.o \
         coredll_uxtheme.o \
-       coredll_window.o \
+       coredll_msw_window.o \
         coredll_helpchm.o \
         coredll_helpchm.o \
-       coredll_helpwin.o \
+       coredll_msw_helpwin.o \
         coredll_automtn.o \
         coredll_uuid.o
  @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4)
  @COND_TOOLKIT_OSX_CARBON@__LOWLEVEL_SRC_OBJECTS_4 \
         coredll_automtn.o \
         coredll_uuid.o
  @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4)
  @COND_TOOLKIT_OSX_CARBON@__LOWLEVEL_SRC_OBJECTS_4 \
-@COND_TOOLKIT_OSX_CARBON@      = $(__OSX_LOWLEVEL_SRC_OBJECTS_1_1)
+@COND_TOOLKIT_OSX_CARBON@      = $(__OSX_LOWLEVEL_SRC_OBJECTS_1_4)
  @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_4 = \
  @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_4 = \
-@COND_TOOLKIT_OSX_COCOA@       $(__OSX_LOWLEVEL_SRC_OBJECTS_1_1)
+@COND_TOOLKIT_OSX_COCOA@       $(__OSX_LOWLEVEL_SRC_OBJECTS_1_4)
+@COND_TOOLKIT_OSX_IPHONE@__LOWLEVEL_SRC_OBJECTS_4 \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__OSX_LOWLEVEL_SRC_OBJECTS_1_4)
  @COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_4 = 
  COND_TOOLKIT_WINCE___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_activex.o \
+       coredll_msw_app.o \
+       coredll_msw_bitmap.o \
+       coredll_msw_brush.o \
+       coredll_msw_caret.o \
+       coredll_msw_clipbrd.o \
+       coredll_msw_colour.o \
+       coredll_msw_cursor.o \
+       coredll_msw_data.o \
+       coredll_msw_dc.o \
+       coredll_msw_dcclient.o \
+       coredll_msw_dcmemory.o \
+       coredll_msw_dcprint.o \
+       coredll_msw_dcscreen.o \
+       coredll_msw_dialup.o \
         coredll_dib.o \
         coredll_dib.o \
-       coredll_display.o \
+       coredll_msw_display.o \
         coredll_enhmeta.o \
         coredll_enhmeta.o \
-       coredll_font.o \
-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_gdiimage.o \
-       coredll_gdiobj.o \
+       coredll_msw_font.o \
+       coredll_msw_fontenum.o \
+       coredll_msw_fontutil.o \
+       coredll_msw_gdiimage.o \
+       coredll_msw_gdiobj.o \
         coredll_gdiplus.o \
         coredll_gdiplus.o \
-       coredll_graphics.o \
-       coredll_icon.o \
-       coredll_imaglist.o \
-       coredll_minifram.o \
-       coredll_dataobj.o \
+       coredll_msw_graphics.o \
+       coredll_msw_icon.o \
+       coredll_msw_imaglist.o \
+       coredll_msw_minifram.o \
+       coredll_ole_dataobj.o \
         coredll_dropsrc.o \
         coredll_droptgt.o \
         coredll_oleutils.o \
         coredll_dropsrc.o \
         coredll_droptgt.o \
         coredll_oleutils.o \
-       coredll_palette.o \
-       coredll_pen.o \
-       coredll_popupwin.o \
-       coredll_printdlg.o \
+       coredll_msw_palette.o \
+       coredll_msw_pen.o \
+       coredll_msw_popupwin.o \
+       coredll_msw_printdlg.o \
         coredll_printwin.o \
         coredll_printwin.o \
-       coredll_region.o \
-       coredll_renderer.o \
-       coredll_settings.o \
-       coredll_tooltip.o \
-       coredll_toplevel.o \
-       coredll_utilsgui.o \
+       coredll_msw_region.o \
+       coredll_msw_renderer.o \
+       coredll_msw_settings.o \
+       coredll_msw_tooltip.o \
+       coredll_msw_toplevel.o \
+       coredll_uiaction.o \
+       coredll_msw_utilsgui.o \
         coredll_uxtheme.o \
         coredll_uxtheme.o \
-       coredll_window.o
+       coredll_msw_window.o
  @COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_4)
  COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_4 =  \
  @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_imaglist.o \
-       coredll_dialup.o \
-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_utilsx11.o \
+       coredll_generic_caret.o \
+       coredll_generic_imaglist.o \
+       coredll_unix_dialup.o \
         coredll_displayx11.o \
         coredll_displayx11.o \
-       coredll_icon.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_minifram.o \
+       coredll_unix_fontenum.o \
+       coredll_unix_fontutil.o \
+       coredll_uiactionx11.o \
+       coredll_utilsx11.o \
+       coredll_generic_icon.o \
+       coredll_generic_timer.o \
+       coredll_x11_app.o \
+       coredll_x11_bitmap.o \
+       coredll_x11_brush.o \
+       coredll_x11_clipbrd.o \
+       coredll_x11_colour.o \
+       coredll_x11_cursor.o \
+       coredll_x11_data.o \
+       coredll_x11_dataobj.o \
+       coredll_x11_dc.o \
+       coredll_x11_dcclient.o \
+       coredll_x11_dcmemory.o \
+       coredll_x11_dcscreen.o \
+       coredll_x11_evtloop.o \
+       coredll_x11_font.o \
+       coredll_x11_minifram.o \
         coredll_nanox.o \
         coredll_nanox.o \
-       coredll_palette.o \
-       coredll_pen.o \
-       coredll_popupwin.o \
-       coredll_region.o \
+       coredll_x11_palette.o \
+       coredll_x11_pen.o \
+       coredll_x11_popupwin.o \
+       coredll_x11_region.o \
         coredll_reparent.o \
         coredll_reparent.o \
-       coredll_settings.o \
-       coredll_toplevel.o \
-       coredll_utils.o \
+       coredll_x11_settings.o \
+       coredll_x11_toplevel.o \
+       coredll_x11_utils.o \
         coredll_utilsx.o \
         coredll_utilsx.o \
-       coredll_window.o
+       coredll_x11_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 \
  @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_4)
  COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 =  \
         coredll_NSBox.o \
@@ -8366,256 +9311,252 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 =  \
         coredll_NSView.o \
         coredll_NSWindow.o \
         coredll_ObjcRef.o \
         coredll_NSView.o \
         coredll_NSWindow.o \
         coredll_ObjcRef.o \
-       coredll_app.o \
-       coredll_bitmap.o \
-       coredll_bmpbuttn.o \
-       coredll_brush.o \
-       coredll_button.o \
-       coredll_checkbox.o \
-       coredll_checklst.o \
-       coredll_choice.o \
-       coredll_clipbrd.o \
-       coredll_colordlg.o \
-       coredll_colour.o \
-       coredll_combobox.o \
-       coredll_control.o \
-       coredll_cursor.o \
-       coredll_data.o \
-       coredll_dataobj.o \
-       coredll_dc.o \
-       coredll_dcclient.o \
-       coredll_dcmemory.o \
-       coredll_dcscreen.o \
-       coredll_dialog.o \
-       coredll_dirdlg.o \
-       coredll_display.o \
+       coredll_cocoa_app.o \
+       coredll_cocoa_bitmap.o \
+       coredll_cocoa_bmpbuttn.o \
+       coredll_cocoa_brush.o \
+       coredll_src_cocoa_button.o \
+       coredll_src_cocoa_checkbox.o \
+       coredll_cocoa_checklst.o \
+       coredll_src_cocoa_choice.o \
+       coredll_cocoa_clipbrd.o \
+       coredll_cocoa_colordlg.o \
+       coredll_src_cocoa_colour.o \
+       coredll_src_cocoa_combobox.o \
+       coredll_cocoa_control.o \
+       coredll_cocoa_cursor.o \
+       coredll_cocoa_data.o \
+       coredll_cocoa_dataobj.o \
+       coredll_cocoa_dc.o \
+       coredll_cocoa_dcclient.o \
+       coredll_cocoa_dcmemory.o \
+       coredll_cocoa_dcscreen.o \
+       coredll_src_cocoa_dialog.o \
+       coredll_src_cocoa_dirdlg.o \
+       coredll_cocoa_display.o \
         coredll_drawer.o \
         coredll_drawer.o \
-       coredll_evtloop.o \
-       coredll_filedlg.o \
-       coredll_font.o \
-       coredll_fontdlg.o \
-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_frame.o \
-       coredll_gauge.o \
-       coredll_icon.o \
-       coredll_listbox.o \
-       coredll_main.o \
+       coredll_src_cocoa_evtloop.o \
+       coredll_src_cocoa_filedlg.o \
+       coredll_cocoa_font.o \
+       coredll_cocoa_fontdlg.o \
+       coredll_cocoa_fontenum.o \
+       coredll_cocoa_fontutil.o \
+       coredll_cocoa_frame.o \
+       coredll_src_cocoa_gauge.o \
+       coredll_cocoa_icon.o \
+       coredll_src_cocoa_listbox.o \
+       coredll_cocoa_main.o \
         coredll_mbarman.o \
         coredll_mbarman.o \
-       coredll_mdi.o \
-       coredll_menu.o \
-       coredll_menuitem.o \
-       coredll_msgdlg.o \
-       coredll_notebook.o \
-       coredll_pen.o \
-       coredll_radiobox.o \
-       coredll_radiobut.o \
-       coredll_region.o \
-       coredll_scrolbar.o \
-       coredll_settings.o \
-       coredll_slider.o \
+       coredll_cocoa_mdi.o \
+       coredll_src_cocoa_menu.o \
+       coredll_src_cocoa_menuitem.o \
+       coredll_src_cocoa_msgdlg.o \
+       coredll_src_cocoa_notebook.o \
+       coredll_cocoa_pen.o \
+       coredll_cocoa_radiobox.o \
+       coredll_src_cocoa_radiobut.o \
+       coredll_cocoa_region.o \
+       coredll_src_cocoa_scrolbar.o \
+       coredll_cocoa_settings.o \
+       coredll_src_cocoa_slider.o \
         coredll_sound.o \
         coredll_sound.o \
-       coredll_spinbutt.o \
-       coredll_statbmp.o \
-       coredll_statbox.o \
+       coredll_src_cocoa_spinbutt.o \
+       coredll_cocoa_statbmp.o \
+       coredll_src_cocoa_statbox.o \
         coredll_statline2.o \
         coredll_statline2.o \
-       coredll_stattext.o \
-       coredll_textctrl.o \
-       coredll_timer.o \
-       coredll_toolbar.o \
-       coredll_tooltip.o \
-       coredll_toplevel.o \
-       coredll_utils.o \
+       coredll_src_cocoa_stattext.o \
+       coredll_src_cocoa_textctrl.o \
+       coredll_cocoa_timer.o \
+       coredll_src_cocoa_toolbar.o \
+       coredll_src_cocoa_tooltip.o \
+       coredll_cocoa_toplevel.o \
+       coredll_src_cocoa_utils.o \
         coredll_utilsexc.o \
         coredll_utilsexc.o \
-       coredll_window.o \
-       coredll_accel.o \
-       coredll_caret.o \
+       coredll_src_cocoa_window.o \
+       coredll_generic_accel.o \
+       coredll_generic_caret.o \
         coredll_clrpickerg.o \
         coredll_collpaneg.o \
         coredll_colrdlgg.o \
         coredll_clrpickerg.o \
         coredll_collpaneg.o \
         coredll_colrdlgg.o \
-       coredll_fdrepdlg.o \
+       coredll_generic_fdrepdlg.o \
         coredll_filepickerg.o \
         coredll_fontdlgg.o \
         coredll_fontpickerg.o \
         coredll_filepickerg.o \
         coredll_fontdlgg.o \
         coredll_fontpickerg.o \
-       coredll_imaglist.o \
-       coredll_listctrl.o \
-       coredll_msgdlgg.o \
+       coredll_generic_imaglist.o \
+       coredll_generic_listctrl.o \
         coredll_paletteg.o \
         coredll_regiong.o \
         coredll_paletteg.o \
         coredll_regiong.o \
-       coredll_statusbr.o \
-       coredll_tabg.o
+       coredll_generic_statusbr.o
  @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_2 =  \
  @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_2 =  \
-       coredll_accel.o \
+       coredll_generic_accel.o \
         coredll_clrpickerg.o \
         coredll_collpaneg.o \
         coredll_colrdlgg.o \
         coredll_dirdlgg.o \
         coredll_clrpickerg.o \
         coredll_collpaneg.o \
         coredll_colrdlgg.o \
         coredll_dirdlgg.o \
-       coredll_fdrepdlg.o \
+       coredll_generic_fdrepdlg.o \
         coredll_filedlgg.o \
         coredll_filepickerg.o \
         coredll_fontdlgg.o \
         coredll_fontpickerg.o \
         coredll_filedlgg.o \
         coredll_filepickerg.o \
         coredll_fontdlgg.o \
         coredll_fontpickerg.o \
-       coredll_listctrl.o \
-       coredll_msgdlgg.o \
+       coredll_generic_listctrl.o \
         coredll_prntdlgg.o \
         coredll_prntdlgg.o \
-       coredll_statusbr.o \
-       coredll_tabg.o \
-       coredll_bmpbuttn.o \
-       coredll_button.o \
-       coredll_checkbox.o \
-       coredll_checklst.o \
-       coredll_choice.o \
-       coredll_combobox.o \
-       coredll_control.o \
-       coredll_dialog.o \
-       coredll_filedlg.o \
-       coredll_fontdlg.o \
-       coredll_frame.o \
-       coredll_gauge.o \
-       coredll_listbox.o \
-       coredll_mdi.o \
-       coredll_menu.o \
-       coredll_notebook.o \
-       coredll_radiobox.o \
-       coredll_radiobut.o \
-       coredll_scrolbar.o \
-       coredll_scrolwin.o \
-       coredll_slider.o \
-       coredll_spinbutt.o \
-       coredll_spinctrl.o \
-       coredll_statbmp.o \
-       coredll_statbox.o \
-       coredll_statline.o \
-       coredll_stattext.o \
-       coredll_tbargtk.o \
-       coredll_textctrl.o \
-       coredll_tglbtn.o
+       coredll_generic_statusbr.o \
+       coredll_gtk1_bmpbuttn.o \
+       coredll_gtk1_button.o \
+       coredll_gtk1_checkbox.o \
+       coredll_gtk1_checklst.o \
+       coredll_gtk1_choice.o \
+       coredll_gtk1_combobox.o \
+       coredll_gtk1_control.o \
+       coredll_gtk1_dialog.o \
+       coredll_gtk1_filedlg.o \
+       coredll_gtk1_fontdlg.o \
+       coredll_gtk1_frame.o \
+       coredll_gtk1_gauge.o \
+       coredll_gtk1_listbox.o \
+       coredll_gtk1_mdi.o \
+       coredll_gtk1_menu.o \
+       coredll_gtk1_mnemonics.o \
+       coredll_gtk1_notebook.o \
+       coredll_gtk1_radiobox.o \
+       coredll_gtk1_radiobut.o \
+       coredll_gtk1_scrolbar.o \
+       coredll_gtk1_scrolwin.o \
+       coredll_gtk1_slider.o \
+       coredll_gtk1_spinbutt.o \
+       coredll_gtk1_spinctrl.o \
+       coredll_gtk1_statbmp.o \
+       coredll_gtk1_statbox.o \
+       coredll_gtk1_statline.o \
+       coredll_gtk1_stattext.o \
+       coredll_gtk1_toolbar.o \
+       coredll_gtk1_textctrl.o \
+       coredll_gtk1_tglbtn.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_2)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2 =  \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_2)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2 =  \
-       coredll_accel.o \
-       coredll_fdrepdlg.o \
+       coredll_generic_accel.o \
+       coredll_generic_fdrepdlg.o \
         coredll_filepickerg.o \
         coredll_filepickerg.o \
-       coredll_graphicc.o \
-       coredll_listctrl.o \
+       coredll_generic_listctrl.o \
         coredll_prntdlgg.o \
         coredll_prntdlgg.o \
-       coredll_statusbr.o \
-       coredll_tabg.o \
+       coredll_generic_statusbr.o \
         coredll_fontdlgg.o \
         coredll_fontdlgg.o \
-       coredll_msgdlgg.o \
+       coredll_gtk_anybutton.o \
         coredll_artgtk.o \
         coredll_artgtk.o \
-       coredll_bmpbuttn.o \
-       coredll_button.o \
-       coredll_checkbox.o \
-       coredll_checklst.o \
-       coredll_choice.o \
+       coredll_gtk_bmpbuttn.o \
+       coredll_gtk_button.o \
+       coredll_gtk_checkbox.o \
+       coredll_gtk_checklst.o \
+       coredll_gtk_choice.o \
         coredll_collpane.o \
         coredll_collpane.o \
-       coredll_colordlg.o \
-       coredll_combobox.o \
-       coredll_control.o \
+       coredll_gtk_colordlg.o \
+       coredll_gtk_combobox.o \
+       coredll_gtk_control.o \
         coredll_clrpicker.o \
         coredll_clrpicker.o \
-       coredll_dialog.o \
+       coredll_gtk_dialog.o \
         coredll_fontpicker.o \
         coredll_filepicker.o \
         coredll_fontpicker.o \
         coredll_filepicker.o \
-       coredll_dirdlg.o \
-       coredll_filedlg.o \
-       coredll_fontdlg.o \
-       coredll_frame.o \
-       coredll_gauge.o \
+       coredll_gtk_dirdlg.o \
+       coredll_gtk_filedlg.o \
+       coredll_gtk_fontdlg.o \
+       coredll_gtk_frame.o \
+       coredll_gtk_gauge.o \
         coredll_gprint.o \
         coredll_gvfs.o \
         coredll_gprint.o \
         coredll_gvfs.o \
-       coredll_print.o \
-       coredll_listbox.o \
-       coredll_mdi.o \
-       coredll_menu.o \
-       coredll_mnemonics.o \
-       coredll_msgdlg.o \
-       coredll_nativewin.o \
-       coredll_notebook.o \
-       coredll_radiobox.o \
-       coredll_radiobut.o \
-       coredll_scrolbar.o \
-       coredll_scrolwin.o \
-       coredll_slider.o \
-       coredll_spinbutt.o \
-       coredll_spinctrl.o \
-       coredll_statbmp.o \
-       coredll_statbox.o \
-       coredll_statline.o \
-       coredll_stattext.o \
-       coredll_tbargtk.o \
-       coredll_textctrl.o \
-       coredll_textentry.o \
-       coredll_tglbtn.o \
+       coredll_gtk_infobar.o \
+       coredll_gtk_listbox.o \
+       coredll_gtk_mdi.o \
+       coredll_gtk_menu.o \
+       coredll_gtk_mnemonics.o \
+       coredll_gtk_msgdlg.o \
+       coredll_gtk_nativewin.o \
+       coredll_gtk_notebook.o \
+       coredll_gtk_print.o \
+       coredll_gtk_radiobox.o \
+       coredll_gtk_radiobut.o \
+       coredll_gtk_scrolbar.o \
+       coredll_gtk_scrolwin.o \
+       coredll_gtk_slider.o \
+       coredll_gtk_spinbutt.o \
+       coredll_gtk_spinctrl.o \
+       coredll_gtk_statbmp.o \
+       coredll_gtk_statbox.o \
+       coredll_gtk_statline.o \
+       coredll_gtk_stattext.o \
+       coredll_gtk_toolbar.o \
+       coredll_gtk_textctrl.o \
+       coredll_gtk_textentry.o \
+       coredll_gtk_tglbtn.o \
         coredll_treeentry_gtk.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2)
  COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 =  \
         coredll_treeentry_gtk.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2)
  COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 =  \
-       coredll_accel.o \
-       coredll_app.o \
-       coredll_bmpbuttn.o \
+       coredll_motif_accel.o \
+       coredll_motif_app.o \
+       coredll_motif_bmpbuttn.o \
         coredll_bmpmotif.o \
         coredll_bmpmotif.o \
-       coredll_button.o \
-       coredll_checkbox.o \
-       coredll_checklst.o \
-       coredll_choice.o \
-       coredll_clipbrd.o \
-       coredll_colour.o \
-       coredll_combobox.o \
+       coredll_motif_button.o \
+       coredll_motif_checkbox.o \
+       coredll_motif_checklst.o \
+       coredll_motif_choice.o \
+       coredll_motif_clipbrd.o \
+       coredll_motif_colour.o \
+       coredll_motif_combobox.o \
         coredll_combobox_native.o \
         coredll_combobox_native.o \
-       coredll_control.o \
-       coredll_cursor.o \
-       coredll_data.o \
-       coredll_dataobj.o \
-       coredll_dc.o \
-       coredll_dcclient.o \
-       coredll_dcmemory.o \
-       coredll_dcscreen.o \
-       coredll_dialog.o \
-       coredll_evtloop.o \
-       coredll_filedlg.o \
-       coredll_font.o \
-       coredll_frame.o \
-       coredll_gauge.o \
-       coredll_gsockmot.o \
-       coredll_icon.o \
-       coredll_listbox.o \
-       coredll_main.o \
-       coredll_mdi.o \
-       coredll_menu.o \
-       coredll_menuitem.o \
-       coredll_minifram.o \
-       coredll_msgdlg.o \
-       coredll_popupwin.o \
-       coredll_radiobox.o \
-       coredll_radiobut.o \
-       coredll_scrolbar.o \
-       coredll_settings.o \
-       coredll_slider.o \
-       coredll_spinbutt.o \
-       coredll_statbmp.o \
-       coredll_statbox.o \
-       coredll_stattext.o \
-       coredll_textctrl.o \
-       coredll_textentry.o \
-       coredll_timer.o \
-       coredll_toolbar.o \
-       coredll_toplevel.o \
-       coredll_utils.o \
-       coredll_window.o \
+       coredll_motif_control.o \
+       coredll_motif_cursor.o \
+       coredll_motif_data.o \
+       coredll_motif_dataobj.o \
+       coredll_motif_dc.o \
+       coredll_motif_dcclient.o \
+       coredll_motif_dcmemory.o \
+       coredll_motif_dcscreen.o \
+       coredll_motif_dialog.o \
+       coredll_motif_evtloop.o \
+       coredll_motif_filedlg.o \
+       coredll_motif_font.o \
+       coredll_motif_frame.o \
+       coredll_motif_gauge.o \
+       coredll_sockmot.o \
+       coredll_motif_icon.o \
+       coredll_motif_listbox.o \
+       coredll_motif_main.o \
+       coredll_motif_menu.o \
+       coredll_motif_menuitem.o \
+       coredll_motif_minifram.o \
+       coredll_motif_msgdlg.o \
+       coredll_motif_popupwin.o \
+       coredll_motif_radiobox.o \
+       coredll_motif_radiobut.o \
+       coredll_motif_scrolbar.o \
+       coredll_motif_settings.o \
+       coredll_motif_slider.o \
+       coredll_motif_spinbutt.o \
+       coredll_motif_statbmp.o \
+       coredll_motif_statbox.o \
+       coredll_motif_stattext.o \
+       coredll_motif_textctrl.o \
+       coredll_motif_textentry.o \
+       coredll_motif_timer.o \
+       coredll_motif_toolbar.o \
+       coredll_motif_toplevel.o \
+       coredll_motif_utils.o \
+       coredll_motif_window.o \
         coredll_xmcombo.o \
         coredll_clrpickerg.o \
         coredll_collpaneg.o \
         coredll_colrdlgg.o \
         coredll_dirdlgg.o \
         coredll_xmcombo.o \
         coredll_clrpickerg.o \
         coredll_collpaneg.o \
         coredll_colrdlgg.o \
         coredll_dirdlgg.o \
-       coredll_fdrepdlg.o \
+       coredll_generic_fdrepdlg.o \
         coredll_filepickerg.o \
         coredll_fontdlgg.o \
         coredll_fontpickerg.o \
         coredll_filepickerg.o \
         coredll_fontdlgg.o \
         coredll_fontpickerg.o \
-       coredll_listctrl.o \
-       coredll_notebook.o \
+       coredll_generic_listctrl.o \
+       coredll_mdig.o \
+       coredll_generic_notebook.o \
         coredll_prntdlgg.o \
         coredll_prntdlgg.o \
-       coredll_statline.o \
-       coredll_statusbr.o \
+       coredll_generic_statline.o \
+       coredll_generic_statusbr.o \
         coredll_tabg.o
  @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2)
  COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 =  \
         coredll_tabg.o
  @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2)
  COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 =  \
@@ -8623,291 +9564,302 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 =  \
         coredll_collpaneg.o \
         coredll_filepickerg.o \
         coredll_fontpickerg.o \
         coredll_collpaneg.o \
         coredll_filepickerg.o \
         coredll_fontpickerg.o \
-       coredll_statusbr.o \
+       coredll_generic_statusbr.o \
         coredll_prntdlgg.o \
         coredll_prntdlgg.o \
-       coredll_accel.o \
-       coredll_bmpbuttn.o \
-       coredll_button.o \
-       coredll_checkbox.o \
-       coredll_choice.o \
-       coredll_colordlg.o \
+       coredll_msw_accel.o \
+       coredll_msw_anybutton.o \
+       coredll_artmsw.o \
+       coredll_msw_bmpbuttn.o \
+       coredll_msw_button.o \
+       coredll_msw_checkbox.o \
+       coredll_msw_choice.o \
+       coredll_msw_colordlg.o \
         coredll_combo.o \
         coredll_combo.o \
-       coredll_combobox.o \
-       coredll_control.o \
-       coredll_dialog.o \
-       coredll_dirdlg.o \
+       coredll_msw_combobox.o \
+       coredll_msw_control.o \
+       coredll_msw_dialog.o \
+       coredll_msw_dirdlg.o \
         coredll_dragimag.o \
         coredll_dragimag.o \
-       coredll_filedlg.o \
-       coredll_frame.o \
-       coredll_gauge.o \
-       coredll_iniconf.o \
-       coredll_listbox.o \
-       coredll_listctrl.o \
-       coredll_mdi.o \
-       coredll_menu.o \
-       coredll_menuitem.o \
-       coredll_metafile.o \
-       coredll_msgdlg.o \
-       coredll_nativdlg.o \
-       coredll_nativewin.o \
-       coredll_notebook.o \
+       coredll_msw_filedlg.o \
+       coredll_msw_frame.o \
+       coredll_msw_gauge.o \
+       coredll_headerctrl.o \
+       coredll_msw_iniconf.o \
+       coredll_msw_listbox.o \
+       coredll_msw_listctrl.o \
+       coredll_msw_mdi.o \
+       coredll_msw_menu.o \
+       coredll_msw_menuitem.o \
+       coredll_msw_metafile.o \
+       coredll_msw_msgdlg.o \
+       coredll_msw_nativdlg.o \
+       coredll_msw_nativewin.o \
+       coredll_msw_notebook.o \
         coredll_access.o \
         coredll_access.o \
-       coredll_ownerdrw.o \
-       coredll_radiobox.o \
-       coredll_radiobut.o \
-       coredll_scrolbar.o \
-       coredll_slider.o \
-       coredll_spinbutt.o \
-       coredll_spinctrl.o \
-       coredll_statbmp.o \
-       coredll_statbox.o \
+       coredll_msw_ownerdrw.o \
+       coredll_panel.o \
+       coredll_progdlg.o \
+       coredll_msw_radiobox.o \
+       coredll_msw_radiobut.o \
+       coredll_richmsgdlg.o \
+       coredll_msw_scrolbar.o \
+       coredll_msw_slider.o \
+       coredll_msw_spinbutt.o \
+       coredll_msw_spinctrl.o \
+       coredll_msw_statbmp.o \
+       coredll_msw_statbox.o \
         coredll_statusbar.o \
         coredll_statusbar.o \
-       coredll_statline.o \
-       coredll_stattext.o \
-       coredll_tabctrl.o \
-       coredll_toolbar.o \
-       coredll_textctrl.o \
-       coredll_textentry.o \
-       coredll_tglbtn.o \
+       coredll_msw_statline.o \
+       coredll_msw_stattext.o \
+       coredll_msw_toolbar.o \
+       coredll_msw_textctrl.o \
+       coredll_msw_textentry.o \
+       coredll_msw_tglbtn.o \
         coredll_treectrl.o \
         coredll_treectrl.o \
-       coredll_checklst.o \
-       coredll_fdrepdlg.o \
-       coredll_fontdlg.o
+       coredll_msw_checklst.o \
+       coredll_msw_fdrepdlg.o \
+       coredll_msw_fontdlg.o
  @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2)
  COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_2 =  \
  @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2)
  COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_2 =  \
-       $(__OSX_CARBON_COCOA_SRC_OBJECTS_8) \
-       coredll_bmpbuttn.o \
-       coredll_button.o \
-       coredll_checkbox.o \
-       coredll_choice.o \
-       coredll_colordlg.o \
-       coredll_dialog.o \
-       coredll_dirdlg.o \
-       coredll_evtloop.o \
-       coredll_filedlg.o \
-       coredll_gauge.o \
-       coredll_listbox.o \
+       $(__OSX_CARBON_COCOA_SRC_OBJECTS_14) \
+       coredll_carbon_anybutton.o \
+       coredll_carbon_bmpbuttn.o \
+       coredll_carbon_button.o \
+       coredll_carbon_checkbox.o \
+       coredll_carbon_choice.o \
+       coredll_carbon_colordlg.o \
+       coredll_carbon_dialog.o \
+       coredll_carbon_dirdlg.o \
+       coredll_carbon_dnd.o \
+       coredll_carbon_evtloop.o \
+       coredll_carbon_filedlg.o \
+       coredll_carbon_gauge.o \
+       coredll_carbon_listbox.o \
         coredll_listctrl_mac.o \
         coredll_listctrl_mac.o \
-       coredll_mdi.o \
-       coredll_menu.o \
-       coredll_menuitem.o \
-       coredll_msgdlg.o \
-       coredll_nonownedwnd.o \
+       coredll_carbon_menu.o \
+       coredll_carbon_menuitem.o \
+       coredll_carbon_msgdlg.o \
+       coredll_carbon_nonownedwnd.o \
         coredll_notebmac.o \
         coredll_notebmac.o \
-       coredll_radiobut.o \
-       coredll_region.o \
-       coredll_scrolbar.o \
-       coredll_slider.o \
-       coredll_spinbutt.o \
-       coredll_srchctrl.o \
-       coredll_statbmp.o \
-       coredll_statbox.o \
+       coredll_carbon_printdlg.o \
+       coredll_carbon_radiobut.o \
+       coredll_carbon_scrolbar.o \
+       coredll_carbon_slider.o \
+       coredll_carbon_spinbutt.o \
+       coredll_carbon_srchctrl.o \
+       coredll_carbon_statbmp.o \
+       coredll_carbon_statbox.o \
         coredll_statlmac.o \
         coredll_statlmac.o \
-       coredll_stattext.o \
-       coredll_textctrl.o \
-       coredll_tglbtn.o \
-       coredll_toolbar.o \
-       coredll_window.o \
-       coredll_webkit.o \
-       coredll_caret.o \
-       coredll_clrpickerg.o \
-       coredll_collpaneg.o \
-       coredll_fdrepdlg.o \
-       coredll_filepickerg.o \
-       coredll_fontdlgg.o \
-       coredll_fontpickerg.o \
-       coredll_listctrl.o \
-       coredll_prntdlgg.o \
-       coredll_statusbr.o \
-       coredll_tabg.o
+       coredll_carbon_stattext.o \
+       coredll_carbon_textctrl.o \
+       coredll_carbon_tglbtn.o \
+       coredll_carbon_toolbar.o \
+       coredll_carbon_tooltip.o \
+       coredll_carbon_window.o
  @COND_TOOLKIT_OSX_CARBON@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_2)
  COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_2 =  \
  @COND_TOOLKIT_OSX_CARBON@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_2)
  COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_2 =  \
-       $(__OSX_CARBON_COCOA_SRC_OBJECTS_8) \
-       coredll_bmpbuttn.o \
-       coredll_button.o \
-       coredll_checkbox.o \
-       coredll_choice.o \
-       coredll_dialog.o \
-       coredll_dirdlg.o \
-       coredll_evtloop.o \
-       coredll_filedlg.o \
-       coredll_gauge.o \
-       coredll_glcanvas.o \
-       coredll_listbox.o \
-       coredll_menu.o \
-       coredll_menuitem.o \
-       coredll_msgdlg.o \
-       coredll_nonownedwnd.o \
-       coredll_notebook.o \
-       coredll_radiobut.o \
-       coredll_scrolbar.o \
-       coredll_slider.o \
-       coredll_spinbutt.o \
-       coredll_srchctrl.o \
-       coredll_statbox.o \
-       coredll_statline.o \
-       coredll_stattext.o \
-       coredll_textctrl.o \
-       coredll_tglbtn.o \
-       coredll_toolbar.o \
-       coredll_window.o \
-       coredll_caret.o \
-       coredll_clrpickerg.o \
-       coredll_collpaneg.o \
-       coredll_fdrepdlg.o \
-       coredll_filepickerg.o \
-       coredll_fontdlgg.o \
-       coredll_fontpickerg.o \
-       coredll_listctrl.o \
-       coredll_prntdlgg.o \
-       coredll_regiong.o \
-       coredll_statusbr.o \
-       coredll_tabg.o
+       $(__OSX_CARBON_COCOA_SRC_OBJECTS_14) \
+       coredll_cocoa_anybutton.o \
+       coredll_osx_cocoa_button.o \
+       coredll_osx_cocoa_checkbox.o \
+       coredll_osx_cocoa_choice.o \
+       coredll_osx_cocoa_colour.o \
+       coredll_osx_cocoa_combobox.o \
+       coredll_osx_cocoa_dialog.o \
+       coredll_osx_cocoa_dirdlg.o \
+       coredll_cocoa_dnd.o \
+       coredll_osx_cocoa_evtloop.o \
+       coredll_osx_cocoa_filedlg.o \
+       coredll_osx_cocoa_gauge.o \
+       coredll_osx_cocoa_listbox.o \
+       coredll_osx_cocoa_menu.o \
+       coredll_osx_cocoa_menuitem.o \
+       coredll_osx_cocoa_msgdlg.o \
+       coredll_cocoa_nonownedwnd.o \
+       coredll_osx_cocoa_notebook.o \
+       coredll_osx_cocoa_radiobut.o \
+       coredll_cocoa_printdlg.o \
+       coredll_osx_cocoa_scrolbar.o \
+       coredll_osx_cocoa_slider.o \
+       coredll_osx_cocoa_spinbutt.o \
+       coredll_cocoa_srchctrl.o \
+       coredll_osx_cocoa_statbox.o \
+       coredll_cocoa_statline.o \
+       coredll_osx_cocoa_stattext.o \
+       coredll_osx_cocoa_textctrl.o \
+       coredll_cocoa_tglbtn.o \
+       coredll_osx_cocoa_toolbar.o \
+       coredll_osx_cocoa_tooltip.o \
+       coredll_osx_cocoa_window.o
  @COND_TOOLKIT_OSX_COCOA@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_2)
  @COND_TOOLKIT_OSX_COCOA@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_2)
+COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_2 =  \
+       $(__OSX_CARBON_COCOA_SRC_OBJECTS_14) \
+       coredll_regiong.o \
+       coredll_generic_icon.o \
+       coredll_iphone_anybutton.o \
+       coredll_iphone_button.o \
+       coredll_iphone_checkbox.o \
+       coredll_iphone_dialog.o \
+       coredll_iphone_evtloop.o \
+       coredll_iphone_gauge.o \
+       coredll_iphone_msgdlg.o \
+       coredll_iphone_nonownedwnd.o \
+       coredll_iphone_scrolbar.o \
+       coredll_iphone_slider.o \
+       coredll_iphone_stattext.o \
+       coredll_iphone_textctrl.o \
+       coredll_iphone_toolbar.o \
+       coredll_iphone_utils.o \
+       coredll_iphone_window.o
+@COND_TOOLKIT_OSX_IPHONE@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_2)
  COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2 =  \
  COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2 =  \
-       coredll_caret.o \
+       coredll_generic_caret.o \
         coredll_clrpickerg.o \
         coredll_collpaneg.o \
         coredll_colrdlgg.o \
         coredll_dirdlgg.o \
         coredll_clrpickerg.o \
         coredll_collpaneg.o \
         coredll_colrdlgg.o \
         coredll_dirdlgg.o \
-       coredll_fdrepdlg.o \
+       coredll_generic_fdrepdlg.o \
         coredll_filepickerg.o \
         coredll_fontpickerg.o \
         coredll_filepickerg.o \
         coredll_fontpickerg.o \
-       coredll_imaglist.o \
-       coredll_listctrl.o \
+       coredll_generic_imaglist.o \
+       coredll_generic_listctrl.o \
         coredll_mdig.o \
         coredll_prntdlgg.o \
         coredll_mdig.o \
         coredll_prntdlgg.o \
-       coredll_statusbr.o \
-       coredll_accel.o \
-       coredll_app.o \
-       coredll_bitmap.o \
-       coredll_bmpbuttn.o \
-       coredll_brush.o \
-       coredll_button.o \
-       coredll_checkbox.o \
-       coredll_checklst.o \
-       coredll_choice.o \
-       coredll_clipbrd.o \
-       coredll_colour.o \
-       coredll_combobox.o \
-       coredll_control.o \
-       coredll_cursor.o \
-       coredll_data.o \
-       coredll_dataobj.o \
-       coredll_dc.o \
-       coredll_dcclient.o \
-       coredll_dcmemory.o \
-       coredll_dcprint.o \
-       coredll_dcscreen.o \
-       coredll_dialog.o \
-       coredll_dnd.o \
-       coredll_evtloop.o \
-       coredll_filedlg.o \
-       coredll_font.o \
-       coredll_fontdlg.o \
-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_frame.o \
-       coredll_gauge.o \
-       coredll_gdiimage.o \
-       coredll_gsockpm.o \
-       coredll_helpwin.o \
-       coredll_icon.o \
-       coredll_iniconf.o \
-       coredll_listbox.o \
-       coredll_main.o \
-       coredll_menu.o \
-       coredll_menuitem.o \
-       coredll_metafile.o \
-       coredll_minifram.o \
-       coredll_msgdlg.o \
-       coredll_nativdlg.o \
-       coredll_notebook.o \
-       coredll_ownerdrw.o \
-       coredll_palette.o \
-       coredll_pen.o \
-       coredll_popupwin.o \
-       coredll_print.o \
-       coredll_radiobox.o \
-       coredll_radiobut.o \
-       coredll_region.o \
-       coredll_scrolbar.o \
-       coredll_settings.o \
-       coredll_slider.o \
-       coredll_spinbutt.o \
-       coredll_spinctrl.o \
-       coredll_statbmp.o \
-       coredll_statbox.o \
-       coredll_statline.o \
-       coredll_stattext.o \
-       coredll_tabctrl.o \
-       coredll_textctrl.o \
-       coredll_textentry.o \
-       coredll_tglbtn.o \
-       coredll_timer.o \
-       coredll_toolbar.o \
-       coredll_tooltip.o \
-       coredll_toplevel.o \
-       coredll_utilsgui.o \
-       coredll_window.o
+       coredll_generic_statusbr.o \
+       coredll_os2_accel.o \
+       coredll_os2_app.o \
+       coredll_os2_bitmap.o \
+       coredll_os2_bmpbuttn.o \
+       coredll_os2_brush.o \
+       coredll_os2_button.o \
+       coredll_os2_checkbox.o \
+       coredll_os2_checklst.o \
+       coredll_os2_choice.o \
+       coredll_os2_clipbrd.o \
+       coredll_os2_colour.o \
+       coredll_os2_combobox.o \
+       coredll_os2_control.o \
+       coredll_os2_cursor.o \
+       coredll_os2_data.o \
+       coredll_os2_dataobj.o \
+       coredll_os2_dc.o \
+       coredll_os2_dcclient.o \
+       coredll_os2_dcmemory.o \
+       coredll_os2_dcprint.o \
+       coredll_os2_dcscreen.o \
+       coredll_os2_dialog.o \
+       coredll_os2_dnd.o \
+       coredll_os2_evtloop.o \
+       coredll_os2_filedlg.o \
+       coredll_os2_font.o \
+       coredll_os2_fontdlg.o \
+       coredll_os2_fontenum.o \
+       coredll_os2_fontutil.o \
+       coredll_os2_frame.o \
+       coredll_os2_gauge.o \
+       coredll_os2_gdiimage.o \
+       coredll_sockpm.o \
+       coredll_os2_helpwin.o \
+       coredll_os2_icon.o \
+       coredll_os2_iniconf.o \
+       coredll_os2_listbox.o \
+       coredll_os2_main.o \
+       coredll_os2_menu.o \
+       coredll_os2_menuitem.o \
+       coredll_os2_metafile.o \
+       coredll_os2_minifram.o \
+       coredll_os2_msgdlg.o \
+       coredll_os2_nativdlg.o \
+       coredll_os2_notebook.o \
+       coredll_os2_ownerdrw.o \
+       coredll_os2_palette.o \
+       coredll_os2_pen.o \
+       coredll_os2_popupwin.o \
+       coredll_os2_print.o \
+       coredll_os2_radiobox.o \
+       coredll_os2_radiobut.o \
+       coredll_os2_region.o \
+       coredll_os2_scrolbar.o \
+       coredll_os2_settings.o \
+       coredll_os2_slider.o \
+       coredll_os2_spinbutt.o \
+       coredll_os2_spinctrl.o \
+       coredll_os2_statbmp.o \
+       coredll_os2_statbox.o \
+       coredll_os2_statline.o \
+       coredll_os2_stattext.o \
+       coredll_os2_textctrl.o \
+       coredll_os2_textentry.o \
+       coredll_os2_tglbtn.o \
+       coredll_os2_timer.o \
+       coredll_os2_toolbar.o \
+       coredll_os2_tooltip.o \
+       coredll_os2_toplevel.o \
+       coredll_os2_utilsgui.o \
+       coredll_os2_window.o
  @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2)
  COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 =  \
         coredll_clrpickerg.o \
         coredll_collpaneg.o \
         coredll_filepickerg.o \
         coredll_fontpickerg.o \
  @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2)
  COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 =  \
         coredll_clrpickerg.o \
         coredll_collpaneg.o \
         coredll_filepickerg.o \
         coredll_fontpickerg.o \
-       coredll_statusbr.o \
+       coredll_generic_statusbr.o \
         coredll_prntdlgg.o \
         coredll_prntdlgg.o \
-       coredll_accel.o \
-       coredll_bmpbuttn.o \
-       coredll_button.o \
-       coredll_checkbox.o \
-       coredll_choice.o \
-       coredll_colordlg.o \
+       coredll_msw_accel.o \
+       coredll_msw_anybutton.o \
+       coredll_artmsw.o \
+       coredll_msw_bmpbuttn.o \
+       coredll_msw_button.o \
+       coredll_msw_checkbox.o \
+       coredll_msw_choice.o \
+       coredll_msw_colordlg.o \
         coredll_combo.o \
         coredll_combo.o \
-       coredll_combobox.o \
-       coredll_control.o \
-       coredll_dialog.o \
-       coredll_dirdlg.o \
+       coredll_msw_combobox.o \
+       coredll_msw_control.o \
+       coredll_msw_dialog.o \
+       coredll_msw_dirdlg.o \
         coredll_dragimag.o \
         coredll_dragimag.o \
-       coredll_filedlg.o \
-       coredll_frame.o \
-       coredll_gauge.o \
-       coredll_iniconf.o \
-       coredll_listbox.o \
-       coredll_listctrl.o \
-       coredll_mdi.o \
-       coredll_menu.o \
-       coredll_menuitem.o \
-       coredll_metafile.o \
-       coredll_msgdlg.o \
-       coredll_nativdlg.o \
-       coredll_nativewin.o \
-       coredll_notebook.o \
+       coredll_msw_filedlg.o \
+       coredll_msw_frame.o \
+       coredll_msw_gauge.o \
+       coredll_headerctrl.o \
+       coredll_msw_iniconf.o \
+       coredll_msw_listbox.o \
+       coredll_msw_listctrl.o \
+       coredll_msw_mdi.o \
+       coredll_msw_menu.o \
+       coredll_msw_menuitem.o \
+       coredll_msw_metafile.o \
+       coredll_msw_msgdlg.o \
+       coredll_msw_nativdlg.o \
+       coredll_msw_nativewin.o \
+       coredll_msw_notebook.o \
         coredll_access.o \
         coredll_access.o \
-       coredll_ownerdrw.o \
-       coredll_radiobox.o \
-       coredll_radiobut.o \
-       coredll_scrolbar.o \
-       coredll_slider.o \
-       coredll_spinbutt.o \
-       coredll_spinctrl.o \
-       coredll_statbmp.o \
-       coredll_statbox.o \
+       coredll_msw_ownerdrw.o \
+       coredll_panel.o \
+       coredll_progdlg.o \
+       coredll_msw_radiobox.o \
+       coredll_msw_radiobut.o \
+       coredll_richmsgdlg.o \
+       coredll_msw_scrolbar.o \
+       coredll_msw_slider.o \
+       coredll_msw_spinbutt.o \
+       coredll_msw_spinctrl.o \
+       coredll_msw_statbmp.o \
+       coredll_msw_statbox.o \
         coredll_statusbar.o \
         coredll_statusbar.o \
-       coredll_statline.o \
-       coredll_stattext.o \
-       coredll_tabctrl.o \
-       coredll_toolbar.o \
-       coredll_textctrl.o \
-       coredll_textentry.o \
-       coredll_tglbtn.o \
+       coredll_msw_statline.o \
+       coredll_msw_stattext.o \
+       coredll_msw_toolbar.o \
+       coredll_msw_textctrl.o \
+       coredll_msw_textentry.o \
+       coredll_msw_tglbtn.o \
         coredll_treectrl.o \
         coredll_dirdlgg.o \
         coredll_treectrl.o \
         coredll_dirdlgg.o \
-       coredll_fdrepdlg.o \
+       coredll_generic_fdrepdlg.o \
         coredll_filedlgg.o \
         coredll_fontdlgg.o \
         coredll_filedlgg.o \
         coredll_fontdlgg.o \
-       coredll_checklst.o \
+       coredll_wince_checklst.o \
         coredll_choicece.o \
         coredll_crt.o \
         coredll_filedlgwce.o \
         coredll_choicece.o \
         coredll_crt.o \
         coredll_filedlgwce.o \
@@ -8921,299 +9873,309 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 =  \
  @COND_TOOLKIT_COCOA@   coredll_hid.o coredll_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5 =  \
         coredll_fontmgrcmn.o \
  @COND_TOOLKIT_COCOA@   coredll_hid.o coredll_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5 =  \
         coredll_fontmgrcmn.o \
-       coredll_caret.o \
-       coredll_colour.o \
-       coredll_icon.o \
-       coredll_imaglist.o \
+       coredll_generic_caret.o \
+       coredll_generic_colour.o \
+       coredll_generic_icon.o \
+       coredll_generic_imaglist.o \
         coredll_mask.o \
         coredll_mask.o \
-       coredll_timer.o \
-       coredll_app.o \
-       coredll_bitmap.o \
-       coredll_brush.o \
-       coredll_cursor.o \
-       coredll_dc.o \
-       coredll_dcclient.o \
-       coredll_dcmemory.o \
-       coredll_dcscreen.o \
-       coredll_evtloop.o \
-       coredll_font.o \
-       coredll_fontenum.o \
-       coredll_fontmgr.o \
-       coredll_nonownedwnd.o \
-       coredll_overlay.o \
-       coredll_pen.o \
-       coredll_region.o \
-       coredll_settings.o \
-       coredll_toplevel.o \
-       coredll_utils.o \
-       coredll_window.o \
+       coredll_dfb_app.o \
+       coredll_dfb_bitmap.o \
+       coredll_dfb_brush.o \
+       coredll_dfb_cursor.o \
+       coredll_dfb_dc.o \
+       coredll_dfb_dcclient.o \
+       coredll_dfb_dcmemory.o \
+       coredll_dfb_dcscreen.o \
+       coredll_dfb_evtloop.o \
+       coredll_dfb_font.o \
+       coredll_dfb_fontenum.o \
+       coredll_dfb_fontmgr.o \
+       coredll_dfb_nonownedwnd.o \
+       coredll_dfb_overlay.o \
+       coredll_dfb_pen.o \
+       coredll_dfb_region.o \
+       coredll_dfb_settings.o \
+       coredll_dfb_toplevel.o \
+       coredll_dfb_utils.o \
+       coredll_dfb_window.o \
         coredll_wrapdfb.o
  @COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_5 =  \
         coredll_wrapdfb.o
  @COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_5 =  \
-       coredll_caret.o \
-       coredll_imaglist.o \
-       coredll_dialup.o \
-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_utilsx11.o \
+       coredll_generic_caret.o \
+       coredll_generic_imaglist.o \
+       coredll_unix_dialup.o \
         coredll_displayx11.o \
         coredll_displayx11.o \
-       coredll_icon.o \
+       coredll_unix_fontenum.o \
+       coredll_unix_fontutil.o \
+       coredll_uiactionx11.o \
+       coredll_utilsx11.o \
+       coredll_generic_icon.o \
         coredll_paletteg.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_gsockgtk.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
+       coredll_gtk1_app.o \
+       coredll_gtk1_bitmap.o \
+       coredll_gtk1_brush.o \
+       coredll_gtk1_clipbrd.o \
+       coredll_gtk1_colour.o \
+       coredll_gtk1_cursor.o \
+       coredll_gtk1_data.o \
+       coredll_gtk1_dataobj.o \
+       coredll_gtk1_dc.o \
+       coredll_gtk1_dcclient.o \
+       coredll_gtk1_dcmemory.o \
+       coredll_gtk1_dcscreen.o \
+       coredll_gtk1_dnd.o \
+       coredll_gtk1_evtloop.o \
+       coredll_gtk1_font.o \
+       coredll_gtk1_sockgtk.o \
+       coredll_gtk1_main.o \
+       coredll_gtk1_minifram.o \
+       coredll_gtk1_pen.o \
+       coredll_gtk1_popupwin.o \
+       coredll_gtk1_region.o \
+       coredll_gtk1_renderer.o \
+       coredll_gtk1_settings.o \
+       coredll_gtk1_timer.o \
+       coredll_gtk1_tooltip.o \
+       coredll_gtk1_toplevel.o \
+       coredll_gtk1_utilsgtk.o \
+       coredll_gtk1_win_gtk.o \
+       coredll_gtk1_window.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_5)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_5 =  \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_5)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_5 =  \
-       coredll_caret.o \
-       coredll_imaglist.o \
-       coredll_dialup.o \
-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_utilsx11.o \
+       coredll_generic_caret.o \
+       coredll_generic_imaglist.o \
+       coredll_unix_dialup.o \
         coredll_displayx11.o \
         coredll_displayx11.o \
-       coredll_icon.o \
+       coredll_unix_fontenum.o \
+       coredll_unix_fontutil.o \
+       coredll_uiactionx11.o \
+       coredll_utilsx11.o \
+       coredll_generic_icon.o \
         coredll_paletteg.o \
         coredll_paletteg.o \
-       coredll_app.o \
+       coredll_gtk_app.o \
         coredll_assertdlg_gtk.o \
         coredll_assertdlg_gtk.o \
-       coredll_bitmap.o \
-       coredll_brush.o \
-       coredll_clipbrd.o \
-       coredll_colour.o \
-       coredll_cursor.o \
-       coredll_dataobj.o \
-       coredll_dc.o \
-       coredll_dcclient.o \
-       coredll_dcmemory.o \
-       coredll_dcscreen.o \
-       coredll_dnd.o \
-       coredll_evtloop.o \
+       coredll_gtk_bitmap.o \
+       coredll_gtk_brush.o \
+       coredll_gtk_clipbrd.o \
+       coredll_gtk_colour.o \
+       coredll_gtk_cursor.o \
+       coredll_gtk_dataobj.o \
+       coredll_gtk_dc.o \
+       coredll_gtk_dcclient.o \
+       coredll_gtk_dcmemory.o \
+       coredll_gtk_dcscreen.o \
+       coredll_gtk_dnd.o \
+       coredll_gtk_evtloop.o \
         coredll_filectrl.o \
         coredll_filectrl.o \
-       coredll_font.o \
-       coredll_gsockgtk.o \
-       coredll_minifram.o \
-       coredll_pen.o \
-       coredll_popupwin.o \
+       coredll_filehistory.o \
+       coredll_gtk_font.o \
+       coredll_gtk_sockgtk.o \
+       coredll_gtk_minifram.o \
+       coredll_gtk_pen.o \
+       coredll_gtk_popupwin.o \
         coredll_private.o \
         coredll_private.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
+       coredll_gtk_region.o \
+       coredll_gtk_renderer.o \
+       coredll_gtk_settings.o \
+       coredll_gtk_timer.o \
+       coredll_gtk_tooltip.o \
+       coredll_gtk_toplevel.o \
+       coredll_gtk_utilsgtk.o \
+       coredll_gtk_win_gtk.o \
+       coredll_gtk_window.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_5)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_5 =  \
         coredll_fontmgrcmn.o \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_5)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_5 =  \
         coredll_fontmgrcmn.o \
-       coredll_caret.o \
-       coredll_colour.o \
-       coredll_icon.o \
-       coredll_imaglist.o \
+       coredll_generic_caret.o \
+       coredll_generic_colour.o \
+       coredll_generic_icon.o \
+       coredll_generic_imaglist.o \
         coredll_mask.o \
         coredll_mask.o \
-       coredll_timer.o \
-       coredll_app.o \
-       coredll_bitmap.o \
-       coredll_brush.o \
-       coredll_clipbrd.o \
-       coredll_cursor.o \
-       coredll_data.o \
-       coredll_dc.o \
-       coredll_dcclient.o \
-       coredll_dcmemory.o \
-       coredll_dcscreen.o \
+       coredll_generic_timer.o \
+       coredll_mgl_app.o \
+       coredll_mgl_bitmap.o \
+       coredll_mgl_brush.o \
+       coredll_mgl_clipbrd.o \
+       coredll_mgl_cursor.o \
+       coredll_mgl_data.o \
+       coredll_mgl_dc.o \
+       coredll_mgl_dcclient.o \
+       coredll_mgl_dcmemory.o \
+       coredll_mgl_dcscreen.o \
         coredll_dirmgl.o \
         coredll_dirmgl.o \
-       coredll_evtloop.o \
-       coredll_font.o \
-       coredll_fontenum.o \
-       coredll_fontmgr.o \
-       coredll_fontutil.o \
-       coredll_palette.o \
-       coredll_pen.o \
-       coredll_region.o \
-       coredll_settings.o \
-       coredll_toplevel.o \
-       coredll_utils.o \
-       coredll_window.o
+       coredll_mgl_evtloop.o \
+       coredll_mgl_font.o \
+       coredll_mgl_fontenum.o \
+       coredll_mgl_fontmgr.o \
+       coredll_mgl_fontutil.o \
+       coredll_mgl_palette.o \
+       coredll_mgl_pen.o \
+       coredll_mgl_region.o \
+       coredll_mgl_settings.o \
+       coredll_mgl_toplevel.o \
+       coredll_mgl_utils.o \
+       coredll_mgl_window.o
  @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_5)
  COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_5 =  \
  @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_imaglist.o \
-       coredll_dialup.o \
-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_utilsx11.o \
+       coredll_generic_caret.o \
+       coredll_generic_imaglist.o \
+       coredll_unix_dialup.o \
         coredll_displayx11.o \
         coredll_displayx11.o \
-       coredll_bitmap.o \
-       coredll_brush.o \
-       coredll_palette.o \
-       coredll_pen.o \
-       coredll_region.o \
+       coredll_unix_fontenum.o \
+       coredll_unix_fontutil.o \
+       coredll_uiactionx11.o \
+       coredll_utilsx11.o \
+       coredll_x11_bitmap.o \
+       coredll_x11_brush.o \
+       coredll_x11_palette.o \
+       coredll_x11_pen.o \
+       coredll_x11_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_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_activex.o \
+       coredll_msw_app.o \
+       coredll_msw_bitmap.o \
+       coredll_msw_brush.o \
+       coredll_msw_caret.o \
+       coredll_msw_clipbrd.o \
+       coredll_msw_colour.o \
+       coredll_msw_cursor.o \
+       coredll_msw_data.o \
+       coredll_msw_dc.o \
+       coredll_msw_dcclient.o \
+       coredll_msw_dcmemory.o \
+       coredll_msw_dcprint.o \
+       coredll_msw_dcscreen.o \
+       coredll_msw_dialup.o \
         coredll_dib.o \
         coredll_dib.o \
-       coredll_display.o \
+       coredll_msw_display.o \
         coredll_enhmeta.o \
         coredll_enhmeta.o \
-       coredll_font.o \
-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_gdiimage.o \
-       coredll_gdiobj.o \
+       coredll_msw_font.o \
+       coredll_msw_fontenum.o \
+       coredll_msw_fontutil.o \
+       coredll_msw_gdiimage.o \
+       coredll_msw_gdiobj.o \
         coredll_gdiplus.o \
         coredll_gdiplus.o \
-       coredll_graphics.o \
-       coredll_icon.o \
-       coredll_imaglist.o \
-       coredll_minifram.o \
-       coredll_dataobj.o \
+       coredll_msw_graphics.o \
+       coredll_msw_icon.o \
+       coredll_msw_imaglist.o \
+       coredll_msw_minifram.o \
+       coredll_ole_dataobj.o \
         coredll_dropsrc.o \
         coredll_droptgt.o \
         coredll_oleutils.o \
         coredll_dropsrc.o \
         coredll_droptgt.o \
         coredll_oleutils.o \
-       coredll_palette.o \
-       coredll_pen.o \
-       coredll_popupwin.o \
-       coredll_printdlg.o \
+       coredll_msw_palette.o \
+       coredll_msw_pen.o \
+       coredll_msw_popupwin.o \
+       coredll_msw_printdlg.o \
         coredll_printwin.o \
         coredll_printwin.o \
-       coredll_region.o \
-       coredll_renderer.o \
-       coredll_settings.o \
-       coredll_tooltip.o \
-       coredll_toplevel.o \
-       coredll_utilsgui.o \
+       coredll_msw_region.o \
+       coredll_msw_renderer.o \
+       coredll_msw_settings.o \
+       coredll_msw_tooltip.o \
+       coredll_msw_toplevel.o \
+       coredll_uiaction.o \
+       coredll_msw_utilsgui.o \
         coredll_uxtheme.o \
         coredll_uxtheme.o \
-       coredll_window.o \
+       coredll_msw_window.o \
         coredll_helpchm.o \
         coredll_helpchm.o \
-       coredll_helpwin.o \
+       coredll_msw_helpwin.o \
         coredll_automtn.o \
         coredll_uuid.o
  @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5)
  @COND_TOOLKIT_OSX_CARBON@__LOWLEVEL_SRC_OBJECTS_5 \
         coredll_automtn.o \
         coredll_uuid.o
  @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5)
  @COND_TOOLKIT_OSX_CARBON@__LOWLEVEL_SRC_OBJECTS_5 \
-@COND_TOOLKIT_OSX_CARBON@      = $(__OSX_LOWLEVEL_SRC_OBJECTS_1_1)
+@COND_TOOLKIT_OSX_CARBON@      = $(__OSX_LOWLEVEL_SRC_OBJECTS_1_4)
  @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \
  @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \
-@COND_TOOLKIT_OSX_COCOA@       $(__OSX_LOWLEVEL_SRC_OBJECTS_1_1)
+@COND_TOOLKIT_OSX_COCOA@       $(__OSX_LOWLEVEL_SRC_OBJECTS_1_4)
+@COND_TOOLKIT_OSX_IPHONE@__LOWLEVEL_SRC_OBJECTS_5 \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__OSX_LOWLEVEL_SRC_OBJECTS_1_4)
  @COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_5 = 
  COND_TOOLKIT_WINCE___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_activex.o \
+       coredll_msw_app.o \
+       coredll_msw_bitmap.o \
+       coredll_msw_brush.o \
+       coredll_msw_caret.o \
+       coredll_msw_clipbrd.o \
+       coredll_msw_colour.o \
+       coredll_msw_cursor.o \
+       coredll_msw_data.o \
+       coredll_msw_dc.o \
+       coredll_msw_dcclient.o \
+       coredll_msw_dcmemory.o \
+       coredll_msw_dcprint.o \
+       coredll_msw_dcscreen.o \
+       coredll_msw_dialup.o \
         coredll_dib.o \
         coredll_dib.o \
-       coredll_display.o \
+       coredll_msw_display.o \
         coredll_enhmeta.o \
         coredll_enhmeta.o \
-       coredll_font.o \
-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_gdiimage.o \
-       coredll_gdiobj.o \
+       coredll_msw_font.o \
+       coredll_msw_fontenum.o \
+       coredll_msw_fontutil.o \
+       coredll_msw_gdiimage.o \
+       coredll_msw_gdiobj.o \
         coredll_gdiplus.o \
         coredll_gdiplus.o \
-       coredll_graphics.o \
-       coredll_icon.o \
-       coredll_imaglist.o \
-       coredll_minifram.o \
-       coredll_dataobj.o \
+       coredll_msw_graphics.o \
+       coredll_msw_icon.o \
+       coredll_msw_imaglist.o \
+       coredll_msw_minifram.o \
+       coredll_ole_dataobj.o \
         coredll_dropsrc.o \
         coredll_droptgt.o \
         coredll_oleutils.o \
         coredll_dropsrc.o \
         coredll_droptgt.o \
         coredll_oleutils.o \
-       coredll_palette.o \
-       coredll_pen.o \
-       coredll_popupwin.o \
-       coredll_printdlg.o \
+       coredll_msw_palette.o \
+       coredll_msw_pen.o \
+       coredll_msw_popupwin.o \
+       coredll_msw_printdlg.o \
         coredll_printwin.o \
         coredll_printwin.o \
-       coredll_region.o \
-       coredll_renderer.o \
-       coredll_settings.o \
-       coredll_tooltip.o \
-       coredll_toplevel.o \
-       coredll_utilsgui.o \
+       coredll_msw_region.o \
+       coredll_msw_renderer.o \
+       coredll_msw_settings.o \
+       coredll_msw_tooltip.o \
+       coredll_msw_toplevel.o \
+       coredll_uiaction.o \
+       coredll_msw_utilsgui.o \
         coredll_uxtheme.o \
         coredll_uxtheme.o \
-       coredll_window.o
+       coredll_msw_window.o
  @COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_5)
  COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_5 =  \
  @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_imaglist.o \
-       coredll_dialup.o \
-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_utilsx11.o \
+       coredll_generic_caret.o \
+       coredll_generic_imaglist.o \
+       coredll_unix_dialup.o \
         coredll_displayx11.o \
         coredll_displayx11.o \
-       coredll_icon.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_minifram.o \
+       coredll_unix_fontenum.o \
+       coredll_unix_fontutil.o \
+       coredll_uiactionx11.o \
+       coredll_utilsx11.o \
+       coredll_generic_icon.o \
+       coredll_generic_timer.o \
+       coredll_x11_app.o \
+       coredll_x11_bitmap.o \
+       coredll_x11_brush.o \
+       coredll_x11_clipbrd.o \
+       coredll_x11_colour.o \
+       coredll_x11_cursor.o \
+       coredll_x11_data.o \
+       coredll_x11_dataobj.o \
+       coredll_x11_dc.o \
+       coredll_x11_dcclient.o \
+       coredll_x11_dcmemory.o \
+       coredll_x11_dcscreen.o \
+       coredll_x11_evtloop.o \
+       coredll_x11_font.o \
+       coredll_x11_minifram.o \
         coredll_nanox.o \
         coredll_nanox.o \
-       coredll_palette.o \
-       coredll_pen.o \
-       coredll_popupwin.o \
-       coredll_region.o \
+       coredll_x11_palette.o \
+       coredll_x11_pen.o \
+       coredll_x11_popupwin.o \
+       coredll_x11_region.o \
         coredll_reparent.o \
         coredll_reparent.o \
-       coredll_settings.o \
-       coredll_toplevel.o \
-       coredll_utils.o \
+       coredll_x11_settings.o \
+       coredll_x11_toplevel.o \
+       coredll_x11_utils.o \
         coredll_utilsx.o \
         coredll_utilsx.o \
-       coredll_window.o
+       coredll_x11_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_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)
@@ -9222,19 +10184,19 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname = \
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = install_corelib
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__uninstall_corelib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = uninstall_corelib
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = install_corelib
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__uninstall_corelib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = uninstall_corelib
-@COND_GCC_PCH_1@__corelib_PCH_INC = -I.pch/wxprec_corelib
-@COND_ICC_PCH_1@__corelib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_corelib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_corelib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_corelib/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__corelib_PCH_INC = -I./.pch/wxprec_corelib
+@COND_ICC_PCH_1@__corelib_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_corelib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_corelib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_corelib/wx/wxprec.h.gch
  @COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 = 
  @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 \
  @COND_PLATFORM_MSDOS_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 = 
  @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 \
-@COND_PLATFORM_WIN32_1@        = corelib_evtloop.o corelib_main.o corelib_mslu.o \
-@COND_PLATFORM_WIN32_1@        corelib_volume.o
+@COND_PLATFORM_WIN32_1@        = corelib_msw_evtloop.o corelib_msw_main.o \
+@COND_PLATFORM_WIN32_1@        corelib_mslu.o corelib_volume.o
  @COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5 \
  @COND_TOOLKIT_OSX_CARBON@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5 \
-@COND_TOOLKIT_OSX_CARBON@      = corelib_utils.o corelib_uma.o
+@COND_TOOLKIT_OSX_CARBON@      = corelib_carbon_utils.o corelib_uma.o
  @COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5 \
  @COND_TOOLKIT_OSX_COCOA@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5 \
-@COND_TOOLKIT_OSX_COCOA@       = corelib_utils.o
+@COND_TOOLKIT_OSX_COCOA@       = corelib_osx_cocoa_utils.o
  COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
         $(__LOWLEVEL_SRC_OBJECTS_6) \
         $(__PLATFORM_SRC_OBJECTS_9) \
  COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
         $(__LOWLEVEL_SRC_OBJECTS_6) \
         $(__PLATFORM_SRC_OBJECTS_9) \
@@ -9242,17 +10204,23 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
         corelib_accelcmn.o \
         corelib_accesscmn.o \
         corelib_anidecod.o \
         corelib_accelcmn.o \
         corelib_accesscmn.o \
         corelib_anidecod.o \
+       corelib_affinematrix2d.o \
         corelib_appcmn.o \
         corelib_artprov.o \
         corelib_artstd.o \
         corelib_appcmn.o \
         corelib_artprov.o \
         corelib_artstd.o \
+       corelib_arttango.o \
         corelib_bmpbase.o \
         corelib_bmpbase.o \
+       corelib_bmpbtncmn.o \
         corelib_bookctrl.o \
         corelib_btncmn.o \
         corelib_cairo.o \
         corelib_bookctrl.o \
         corelib_btncmn.o \
         corelib_cairo.o \
+       corelib_checkboxcmn.o \
+       corelib_checklstcmn.o \
         corelib_choiccmn.o \
         corelib_clipcmn.o \
         corelib_clrpickercmn.o \
         corelib_colourcmn.o \
         corelib_choiccmn.o \
         corelib_clipcmn.o \
         corelib_clrpickercmn.o \
         corelib_colourcmn.o \
+       corelib_colourdata.o \
         corelib_combocmn.o \
         corelib_cmdproc.o \
         corelib_cmndata.o \
         corelib_combocmn.o \
         corelib_cmdproc.o \
         corelib_cmndata.o \
@@ -9260,11 +10228,11 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
         corelib_cshelp.o \
         corelib_ctrlcmn.o \
         corelib_ctrlsub.o \
         corelib_cshelp.o \
         corelib_ctrlcmn.o \
         corelib_ctrlsub.o \
-       corelib_datacmn.o \
         corelib_dcbase.o \
         corelib_dcbufcmn.o \
         corelib_dcgraph.o \
         corelib_dcsvg.o \
         corelib_dcbase.o \
         corelib_dcbufcmn.o \
         corelib_dcgraph.o \
         corelib_dcsvg.o \
+       corelib_dirctrlcmn.o \
         corelib_dlgcmn.o \
         corelib_dndcmn.o \
         corelib_dobjcmn.o \
         corelib_dlgcmn.o \
         corelib_dndcmn.o \
         corelib_dobjcmn.o \
@@ -9275,10 +10243,13 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
         corelib_effects.o \
         corelib_fddlgcmn.o \
         corelib_filectrlcmn.o \
         corelib_effects.o \
         corelib_fddlgcmn.o \
         corelib_filectrlcmn.o \
+       corelib_filehistorycmn.o \
         corelib_filepickercmn.o \
         corelib_fontpickercmn.o \
         corelib_fldlgcmn.o \
         corelib_fontcmn.o \
         corelib_filepickercmn.o \
         corelib_fontpickercmn.o \
         corelib_fldlgcmn.o \
         corelib_fontcmn.o \
+       corelib_fontdata.o \
+       corelib_graphicc.o \
         corelib_fontenumcmn.o \
         corelib_fontmap.o \
         corelib_fontutilcmn.o \
         corelib_fontenumcmn.o \
         corelib_fontmap.o \
         corelib_fontutilcmn.o \
@@ -9289,6 +10260,8 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
         corelib_geometry.o \
         corelib_gifdecod.o \
         corelib_graphcmn.o \
         corelib_geometry.o \
         corelib_gifdecod.o \
         corelib_graphcmn.o \
+       corelib_headercolcmn.o \
+       corelib_headerctrlcmn.o \
         corelib_helpbase.o \
         corelib_iconbndl.o \
         corelib_imagall.o \
         corelib_helpbase.o \
         corelib_iconbndl.o \
         corelib_imagall.o \
@@ -9307,22 +10280,36 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
         corelib_layout.o \
         corelib_lboxcmn.o \
         corelib_listctrlcmn.o \
         corelib_layout.o \
         corelib_lboxcmn.o \
         corelib_listctrlcmn.o \
+       corelib_markupparser.o \
         corelib_matrix.o \
         corelib_menucmn.o \
         corelib_matrix.o \
         corelib_menucmn.o \
+       corelib_mousemanager.o \
         corelib_nbkbase.o \
         corelib_overlaycmn.o \
         corelib_nbkbase.o \
         corelib_overlaycmn.o \
+       corelib_ownerdrwcmn.o \
         corelib_paper.o \
         corelib_paper.o \
+       corelib_panelcmn.o \
+       corelib_persist.o \
         corelib_pickerbase.o \
         corelib_popupcmn.o \
         corelib_prntbase.o \
         corelib_quantize.o \
         corelib_pickerbase.o \
         corelib_popupcmn.o \
         corelib_prntbase.o \
         corelib_quantize.o \
+       corelib_radiobtncmn.o \
         corelib_radiocmn.o \
         corelib_radiocmn.o \
+       corelib_rearrangectrl.o \
         corelib_rendcmn.o \
         corelib_rgncmn.o \
         corelib_rendcmn.o \
         corelib_rgncmn.o \
+       corelib_scrolbarcmn.o \
         corelib_settcmn.o \
         corelib_sizer.o \
         corelib_settcmn.o \
         corelib_sizer.o \
+       corelib_slidercmn.o \
+       corelib_spinbtncmn.o \
+       corelib_spinctrlcmn.o \
         corelib_srchcmn.o \
         corelib_statbar.o \
         corelib_srchcmn.o \
         corelib_statbar.o \
+       corelib_statbmpcmn.o \
+       corelib_statboxcmn.o \
+       corelib_statlinecmn.o \
         corelib_stattextcmn.o \
         corelib_stockitem.o \
         corelib_tbarbase.o \
         corelib_stattextcmn.o \
         corelib_stockitem.o \
         corelib_tbarbase.o \
@@ -9330,9 +10317,11 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
         corelib_textentrycmn.o \
         corelib_toplvcmn.o \
         corelib_treebase.o \
         corelib_textentrycmn.o \
         corelib_toplvcmn.o \
         corelib_treebase.o \
+       corelib_uiactioncmn.o \
         corelib_valgen.o \
         corelib_validate.o \
         corelib_valtext.o \
         corelib_valgen.o \
         corelib_validate.o \
         corelib_valtext.o \
+       corelib_valnum.o \
         corelib_wincmn.o \
         corelib_windowid.o \
         corelib_wrapsizer.o \
         corelib_wincmn.o \
         corelib_windowid.o \
         corelib_wrapsizer.o \
@@ -9346,19 +10335,25 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
         corelib_dirctrlg.o \
         corelib_dragimgg.o \
         corelib_filectrlg.o \
         corelib_dirctrlg.o \
         corelib_dragimgg.o \
         corelib_filectrlg.o \
+       corelib_headerctrlg.o \
+       corelib_generic_infobar.o \
         corelib_listbkg.o \
         corelib_logg.o \
         corelib_listbkg.o \
         corelib_logg.o \
+       corelib_markuptext.o \
+       corelib_msgdlgg.o \
         corelib_numdlgg.o \
         corelib_panelg.o \
         corelib_progdlgg.o \
         corelib_printps.o \
         corelib_renderg.o \
         corelib_numdlgg.o \
         corelib_panelg.o \
         corelib_progdlgg.o \
         corelib_printps.o \
         corelib_renderg.o \
+       corelib_richmsgdlgg.o \
         corelib_scrlwing.o \
         corelib_selstore.o \
         corelib_spinctlg.o \
         corelib_splitter.o \
         corelib_srchctlg.o \
         corelib_statbmpg.o \
         corelib_scrlwing.o \
         corelib_selstore.o \
         corelib_spinctlg.o \
         corelib_splitter.o \
         corelib_srchctlg.o \
         corelib_statbmpg.o \
+       corelib_stattextg.o \
         corelib_textdlgg.o \
         corelib_tipwin.o \
         corelib_toolbkg.o \
         corelib_textdlgg.o \
         corelib_tipwin.o \
         corelib_toolbkg.o \
@@ -9370,55 +10365,53 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
  COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
         $(__LOWLEVEL_SRC_OBJECTS_7) \
         $(__PLATFORM_SRC_OBJECTS_9) \
  COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
         $(__LOWLEVEL_SRC_OBJECTS_7) \
         $(__PLATFORM_SRC_OBJECTS_9) \
-       corelib_accel.o \
+       corelib_generic_accel.o \
         corelib_clrpickerg.o \
         corelib_collpaneg.o \
         corelib_colrdlgg.o \
         corelib_dirdlgg.o \
         corelib_clrpickerg.o \
         corelib_collpaneg.o \
         corelib_colrdlgg.o \
         corelib_dirdlgg.o \
-       corelib_fdrepdlg.o \
+       corelib_generic_fdrepdlg.o \
         corelib_filedlgg.o \
         corelib_filepickerg.o \
         corelib_fontdlgg.o \
         corelib_fontpickerg.o \
         corelib_filedlgg.o \
         corelib_filepickerg.o \
         corelib_fontdlgg.o \
         corelib_fontpickerg.o \
-       corelib_listctrl.o \
+       corelib_generic_listctrl.o \
         corelib_mdig.o \
         corelib_mdig.o \
-       corelib_msgdlgg.o \
         corelib_prntdlgg.o \
         corelib_prntdlgg.o \
-       corelib_tabg.o \
-       corelib_bmpbuttn.o \
-       corelib_button.o \
-       corelib_checkbox.o \
-       corelib_checklst.o \
-       corelib_choice.o \
-       corelib_combobox.o \
-       corelib_control.o \
+       corelib_univ_bmpbuttn.o \
+       corelib_univ_button.o \
+       corelib_univ_checkbox.o \
+       corelib_univ_checklst.o \
+       corelib_univ_choice.o \
+       corelib_univ_combobox.o \
+       corelib_univ_control.o \
         corelib_ctrlrend.o \
         corelib_ctrlrend.o \
-       corelib_dialog.o \
+       corelib_univ_dialog.o \
         corelib_framuniv.o \
         corelib_framuniv.o \
-       corelib_gauge.o \
+       corelib_univ_gauge.o \
         corelib_inpcons.o \
         corelib_inphand.o \
         corelib_inpcons.o \
         corelib_inphand.o \
-       corelib_listbox.o \
-       corelib_menu.o \
-       corelib_notebook.o \
-       corelib_radiobox.o \
-       corelib_radiobut.o \
+       corelib_univ_listbox.o \
+       corelib_univ_menu.o \
+       corelib_univ_notebook.o \
+       corelib_univ_radiobox.o \
+       corelib_univ_radiobut.o \
         corelib_scrarrow.o \
         corelib_scrarrow.o \
-       corelib_scrolbar.o \
+       corelib_univ_scrolbar.o \
         corelib_scrthumb.o \
         corelib_settingsuniv.o \
         corelib_scrthumb.o \
         corelib_settingsuniv.o \
-       corelib_slider.o \
-       corelib_spinbutt.o \
-       corelib_statbmp.o \
-       corelib_statbox.o \
-       corelib_statline.o \
-       corelib_stattext.o \
-       corelib_statusbr.o \
+       corelib_univ_slider.o \
+       corelib_univ_spinbutt.o \
+       corelib_univ_statbmp.o \
+       corelib_univ_statbox.o \
+       corelib_univ_statline.o \
+       corelib_univ_stattext.o \
+       corelib_univ_statusbr.o \
         corelib_stdrend.o \
         corelib_stdrend.o \
-       corelib_textctrl.o \
-       corelib_tglbtn.o \
+       corelib_univ_textctrl.o \
+       corelib_univ_tglbtn.o \
         corelib_theme.o \
         corelib_theme.o \
-       corelib_toolbar.o \
+       corelib_univ_toolbar.o \
         corelib_topluniv.o \
         corelib_winuniv.o \
         corelib_gtk.o \
         corelib_topluniv.o \
         corelib_winuniv.o \
         corelib_gtk.o \
@@ -9428,17 +10421,23 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
         corelib_accelcmn.o \
         corelib_accesscmn.o \
         corelib_anidecod.o \
         corelib_accelcmn.o \
         corelib_accesscmn.o \
         corelib_anidecod.o \
+       corelib_affinematrix2d.o \
         corelib_appcmn.o \
         corelib_artprov.o \
         corelib_artstd.o \
         corelib_appcmn.o \
         corelib_artprov.o \
         corelib_artstd.o \
+       corelib_arttango.o \
         corelib_bmpbase.o \
         corelib_bmpbase.o \
+       corelib_bmpbtncmn.o \
         corelib_bookctrl.o \
         corelib_btncmn.o \
         corelib_cairo.o \
         corelib_bookctrl.o \
         corelib_btncmn.o \
         corelib_cairo.o \
+       corelib_checkboxcmn.o \
+       corelib_checklstcmn.o \
         corelib_choiccmn.o \
         corelib_clipcmn.o \
         corelib_clrpickercmn.o \
         corelib_colourcmn.o \
         corelib_choiccmn.o \
         corelib_clipcmn.o \
         corelib_clrpickercmn.o \
         corelib_colourcmn.o \
+       corelib_colourdata.o \
         corelib_combocmn.o \
         corelib_cmdproc.o \
         corelib_cmndata.o \
         corelib_combocmn.o \
         corelib_cmdproc.o \
         corelib_cmndata.o \
@@ -9446,11 +10445,11 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
         corelib_cshelp.o \
         corelib_ctrlcmn.o \
         corelib_ctrlsub.o \
         corelib_cshelp.o \
         corelib_ctrlcmn.o \
         corelib_ctrlsub.o \
-       corelib_datacmn.o \
         corelib_dcbase.o \
         corelib_dcbufcmn.o \
         corelib_dcgraph.o \
         corelib_dcsvg.o \
         corelib_dcbase.o \
         corelib_dcbufcmn.o \
         corelib_dcgraph.o \
         corelib_dcsvg.o \
+       corelib_dirctrlcmn.o \
         corelib_dlgcmn.o \
         corelib_dndcmn.o \
         corelib_dobjcmn.o \
         corelib_dlgcmn.o \
         corelib_dndcmn.o \
         corelib_dobjcmn.o \
@@ -9461,10 +10460,13 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
         corelib_effects.o \
         corelib_fddlgcmn.o \
         corelib_filectrlcmn.o \
         corelib_effects.o \
         corelib_fddlgcmn.o \
         corelib_filectrlcmn.o \
+       corelib_filehistorycmn.o \
         corelib_filepickercmn.o \
         corelib_fontpickercmn.o \
         corelib_fldlgcmn.o \
         corelib_fontcmn.o \
         corelib_filepickercmn.o \
         corelib_fontpickercmn.o \
         corelib_fldlgcmn.o \
         corelib_fontcmn.o \
+       corelib_fontdata.o \
+       corelib_graphicc.o \
         corelib_fontenumcmn.o \
         corelib_fontmap.o \
         corelib_fontutilcmn.o \
         corelib_fontenumcmn.o \
         corelib_fontmap.o \
         corelib_fontutilcmn.o \
@@ -9475,6 +10477,8 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
         corelib_geometry.o \
         corelib_gifdecod.o \
         corelib_graphcmn.o \
         corelib_geometry.o \
         corelib_gifdecod.o \
         corelib_graphcmn.o \
+       corelib_headercolcmn.o \
+       corelib_headerctrlcmn.o \
         corelib_helpbase.o \
         corelib_iconbndl.o \
         corelib_imagall.o \
         corelib_helpbase.o \
         corelib_iconbndl.o \
         corelib_imagall.o \
@@ -9493,22 +10497,36 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
         corelib_layout.o \
         corelib_lboxcmn.o \
         corelib_listctrlcmn.o \
         corelib_layout.o \
         corelib_lboxcmn.o \
         corelib_listctrlcmn.o \
+       corelib_markupparser.o \
         corelib_matrix.o \
         corelib_menucmn.o \
         corelib_matrix.o \
         corelib_menucmn.o \
+       corelib_mousemanager.o \
         corelib_nbkbase.o \
         corelib_overlaycmn.o \
         corelib_nbkbase.o \
         corelib_overlaycmn.o \
+       corelib_ownerdrwcmn.o \
         corelib_paper.o \
         corelib_paper.o \
+       corelib_panelcmn.o \
+       corelib_persist.o \
         corelib_pickerbase.o \
         corelib_popupcmn.o \
         corelib_prntbase.o \
         corelib_quantize.o \
         corelib_pickerbase.o \
         corelib_popupcmn.o \
         corelib_prntbase.o \
         corelib_quantize.o \
+       corelib_radiobtncmn.o \
         corelib_radiocmn.o \
         corelib_radiocmn.o \
+       corelib_rearrangectrl.o \
         corelib_rendcmn.o \
         corelib_rgncmn.o \
         corelib_rendcmn.o \
         corelib_rgncmn.o \
+       corelib_scrolbarcmn.o \
         corelib_settcmn.o \
         corelib_sizer.o \
         corelib_settcmn.o \
         corelib_sizer.o \
+       corelib_slidercmn.o \
+       corelib_spinbtncmn.o \
+       corelib_spinctrlcmn.o \
         corelib_srchcmn.o \
         corelib_statbar.o \
         corelib_srchcmn.o \
         corelib_statbar.o \
+       corelib_statbmpcmn.o \
+       corelib_statboxcmn.o \
+       corelib_statlinecmn.o \
         corelib_stattextcmn.o \
         corelib_stockitem.o \
         corelib_tbarbase.o \
         corelib_stattextcmn.o \
         corelib_stockitem.o \
         corelib_tbarbase.o \
@@ -9516,9 +10534,11 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
         corelib_textentrycmn.o \
         corelib_toplvcmn.o \
         corelib_treebase.o \
         corelib_textentrycmn.o \
         corelib_toplvcmn.o \
         corelib_treebase.o \
+       corelib_uiactioncmn.o \
         corelib_valgen.o \
         corelib_validate.o \
         corelib_valtext.o \
         corelib_valgen.o \
         corelib_validate.o \
         corelib_valtext.o \
+       corelib_valnum.o \
         corelib_wincmn.o \
         corelib_windowid.o \
         corelib_wrapsizer.o \
         corelib_wincmn.o \
         corelib_windowid.o \
         corelib_wrapsizer.o \
@@ -9532,19 +10552,25 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
         corelib_dirctrlg.o \
         corelib_dragimgg.o \
         corelib_filectrlg.o \
         corelib_dirctrlg.o \
         corelib_dragimgg.o \
         corelib_filectrlg.o \
+       corelib_headerctrlg.o \
+       corelib_generic_infobar.o \
         corelib_listbkg.o \
         corelib_logg.o \
         corelib_listbkg.o \
         corelib_logg.o \
+       corelib_markuptext.o \
+       corelib_msgdlgg.o \
         corelib_numdlgg.o \
         corelib_panelg.o \
         corelib_progdlgg.o \
         corelib_printps.o \
         corelib_renderg.o \
         corelib_numdlgg.o \
         corelib_panelg.o \
         corelib_progdlgg.o \
         corelib_printps.o \
         corelib_renderg.o \
+       corelib_richmsgdlgg.o \
         corelib_scrlwing.o \
         corelib_selstore.o \
         corelib_spinctlg.o \
         corelib_splitter.o \
         corelib_srchctlg.o \
         corelib_statbmpg.o \
         corelib_scrlwing.o \
         corelib_selstore.o \
         corelib_spinctlg.o \
         corelib_splitter.o \
         corelib_srchctlg.o \
         corelib_statbmpg.o \
+       corelib_stattextg.o \
         corelib_textdlgg.o \
         corelib_tipwin.o \
         corelib_toolbkg.o \
         corelib_textdlgg.o \
         corelib_tipwin.o \
         corelib_toolbkg.o \
@@ -9557,299 +10583,309 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
  @COND_TOOLKIT_COCOA@   corelib_hid.o corelib_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_6 =  \
         corelib_fontmgrcmn.o \
  @COND_TOOLKIT_COCOA@   corelib_hid.o corelib_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_6 =  \
         corelib_fontmgrcmn.o \
-       corelib_caret.o \
-       corelib_colour.o \
-       corelib_icon.o \
-       corelib_imaglist.o \
+       corelib_generic_caret.o \
+       corelib_generic_colour.o \
+       corelib_generic_icon.o \
+       corelib_generic_imaglist.o \
         corelib_mask.o \
         corelib_mask.o \
-       corelib_timer.o \
-       corelib_app.o \
-       corelib_bitmap.o \
-       corelib_brush.o \
-       corelib_cursor.o \
-       corelib_dc.o \
-       corelib_dcclient.o \
-       corelib_dcmemory.o \
-       corelib_dcscreen.o \
-       corelib_evtloop.o \
-       corelib_font.o \
-       corelib_fontenum.o \
-       corelib_fontmgr.o \
-       corelib_nonownedwnd.o \
-       corelib_overlay.o \
-       corelib_pen.o \
-       corelib_region.o \
-       corelib_settings.o \
-       corelib_toplevel.o \
-       corelib_utils.o \
-       corelib_window.o \
+       corelib_dfb_app.o \
+       corelib_dfb_bitmap.o \
+       corelib_dfb_brush.o \
+       corelib_dfb_cursor.o \
+       corelib_dfb_dc.o \
+       corelib_dfb_dcclient.o \
+       corelib_dfb_dcmemory.o \
+       corelib_dfb_dcscreen.o \
+       corelib_dfb_evtloop.o \
+       corelib_dfb_font.o \
+       corelib_dfb_fontenum.o \
+       corelib_dfb_fontmgr.o \
+       corelib_dfb_nonownedwnd.o \
+       corelib_dfb_overlay.o \
+       corelib_dfb_pen.o \
+       corelib_dfb_region.o \
+       corelib_dfb_settings.o \
+       corelib_dfb_toplevel.o \
+       corelib_dfb_utils.o \
+       corelib_dfb_window.o \
         corelib_wrapdfb.o
  @COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_6)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_6 =  \
         corelib_wrapdfb.o
  @COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_6)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_6 =  \
-       corelib_caret.o \
-       corelib_imaglist.o \
-       corelib_dialup.o \
-       corelib_fontenum.o \
-       corelib_fontutil.o \
-       corelib_utilsx11.o \
+       corelib_generic_caret.o \
+       corelib_generic_imaglist.o \
+       corelib_unix_dialup.o \
         corelib_displayx11.o \
         corelib_displayx11.o \
-       corelib_icon.o \
+       corelib_unix_fontenum.o \
+       corelib_unix_fontutil.o \
+       corelib_uiactionx11.o \
+       corelib_utilsx11.o \
+       corelib_generic_icon.o \
         corelib_paletteg.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_gsockgtk.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
+       corelib_gtk1_app.o \
+       corelib_gtk1_bitmap.o \
+       corelib_gtk1_brush.o \
+       corelib_gtk1_clipbrd.o \
+       corelib_gtk1_colour.o \
+       corelib_gtk1_cursor.o \
+       corelib_gtk1_data.o \
+       corelib_gtk1_dataobj.o \
+       corelib_gtk1_dc.o \
+       corelib_gtk1_dcclient.o \
+       corelib_gtk1_dcmemory.o \
+       corelib_gtk1_dcscreen.o \
+       corelib_gtk1_dnd.o \
+       corelib_gtk1_evtloop.o \
+       corelib_gtk1_font.o \
+       corelib_gtk1_sockgtk.o \
+       corelib_gtk1_main.o \
+       corelib_gtk1_minifram.o \
+       corelib_gtk1_pen.o \
+       corelib_gtk1_popupwin.o \
+       corelib_gtk1_region.o \
+       corelib_gtk1_renderer.o \
+       corelib_gtk1_settings.o \
+       corelib_gtk1_timer.o \
+       corelib_gtk1_tooltip.o \
+       corelib_gtk1_toplevel.o \
+       corelib_gtk1_utilsgtk.o \
+       corelib_gtk1_win_gtk.o \
+       corelib_gtk1_window.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_6)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_6 =  \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_6)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_6 =  \
-       corelib_caret.o \
-       corelib_imaglist.o \
-       corelib_dialup.o \
-       corelib_fontenum.o \
-       corelib_fontutil.o \
-       corelib_utilsx11.o \
+       corelib_generic_caret.o \
+       corelib_generic_imaglist.o \
+       corelib_unix_dialup.o \
         corelib_displayx11.o \
         corelib_displayx11.o \
-       corelib_icon.o \
+       corelib_unix_fontenum.o \
+       corelib_unix_fontutil.o \
+       corelib_uiactionx11.o \
+       corelib_utilsx11.o \
+       corelib_generic_icon.o \
         corelib_paletteg.o \
         corelib_paletteg.o \
-       corelib_app.o \
+       corelib_gtk_app.o \
         corelib_assertdlg_gtk.o \
         corelib_assertdlg_gtk.o \
-       corelib_bitmap.o \
-       corelib_brush.o \
-       corelib_clipbrd.o \
-       corelib_colour.o \
-       corelib_cursor.o \
-       corelib_dataobj.o \
-       corelib_dc.o \
-       corelib_dcclient.o \
-       corelib_dcmemory.o \
-       corelib_dcscreen.o \
-       corelib_dnd.o \
-       corelib_evtloop.o \
+       corelib_gtk_bitmap.o \
+       corelib_gtk_brush.o \
+       corelib_gtk_clipbrd.o \
+       corelib_gtk_colour.o \
+       corelib_gtk_cursor.o \
+       corelib_gtk_dataobj.o \
+       corelib_gtk_dc.o \
+       corelib_gtk_dcclient.o \
+       corelib_gtk_dcmemory.o \
+       corelib_gtk_dcscreen.o \
+       corelib_gtk_dnd.o \
+       corelib_gtk_evtloop.o \
         corelib_filectrl.o \
         corelib_filectrl.o \
-       corelib_font.o \
-       corelib_gsockgtk.o \
-       corelib_minifram.o \
-       corelib_pen.o \
-       corelib_popupwin.o \
+       corelib_filehistory.o \
+       corelib_gtk_font.o \
+       corelib_gtk_sockgtk.o \
+       corelib_gtk_minifram.o \
+       corelib_gtk_pen.o \
+       corelib_gtk_popupwin.o \
         corelib_private.o \
         corelib_private.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
+       corelib_gtk_region.o \
+       corelib_gtk_renderer.o \
+       corelib_gtk_settings.o \
+       corelib_gtk_timer.o \
+       corelib_gtk_tooltip.o \
+       corelib_gtk_toplevel.o \
+       corelib_gtk_utilsgtk.o \
+       corelib_gtk_win_gtk.o \
+       corelib_gtk_window.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_6)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_6 =  \
         corelib_fontmgrcmn.o \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_6)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_6 =  \
         corelib_fontmgrcmn.o \
-       corelib_caret.o \
-       corelib_colour.o \
-       corelib_icon.o \
-       corelib_imaglist.o \
+       corelib_generic_caret.o \
+       corelib_generic_colour.o \
+       corelib_generic_icon.o \
+       corelib_generic_imaglist.o \
         corelib_mask.o \
         corelib_mask.o \
-       corelib_timer.o \
-       corelib_app.o \
-       corelib_bitmap.o \
-       corelib_brush.o \
-       corelib_clipbrd.o \
-       corelib_cursor.o \
-       corelib_data.o \
-       corelib_dc.o \
-       corelib_dcclient.o \
-       corelib_dcmemory.o \
-       corelib_dcscreen.o \
+       corelib_generic_timer.o \
+       corelib_mgl_app.o \
+       corelib_mgl_bitmap.o \
+       corelib_mgl_brush.o \
+       corelib_mgl_clipbrd.o \
+       corelib_mgl_cursor.o \
+       corelib_mgl_data.o \
+       corelib_mgl_dc.o \
+       corelib_mgl_dcclient.o \
+       corelib_mgl_dcmemory.o \
+       corelib_mgl_dcscreen.o \
         corelib_dirmgl.o \
         corelib_dirmgl.o \
-       corelib_evtloop.o \
-       corelib_font.o \
-       corelib_fontenum.o \
-       corelib_fontmgr.o \
-       corelib_fontutil.o \
-       corelib_palette.o \
-       corelib_pen.o \
-       corelib_region.o \
-       corelib_settings.o \
-       corelib_toplevel.o \
-       corelib_utils.o \
-       corelib_window.o
+       corelib_mgl_evtloop.o \
+       corelib_mgl_font.o \
+       corelib_mgl_fontenum.o \
+       corelib_mgl_fontmgr.o \
+       corelib_mgl_fontutil.o \
+       corelib_mgl_palette.o \
+       corelib_mgl_pen.o \
+       corelib_mgl_region.o \
+       corelib_mgl_settings.o \
+       corelib_mgl_toplevel.o \
+       corelib_mgl_utils.o \
+       corelib_mgl_window.o
  @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_6)
  COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_6 =  \
  @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_imaglist.o \
-       corelib_dialup.o \
-       corelib_fontenum.o \
-       corelib_fontutil.o \
-       corelib_utilsx11.o \
+       corelib_generic_caret.o \
+       corelib_generic_imaglist.o \
+       corelib_unix_dialup.o \
         corelib_displayx11.o \
         corelib_displayx11.o \
-       corelib_bitmap.o \
-       corelib_brush.o \
-       corelib_palette.o \
-       corelib_pen.o \
-       corelib_region.o \
+       corelib_unix_fontenum.o \
+       corelib_unix_fontutil.o \
+       corelib_uiactionx11.o \
+       corelib_utilsx11.o \
+       corelib_x11_bitmap.o \
+       corelib_x11_brush.o \
+       corelib_x11_palette.o \
+       corelib_x11_pen.o \
+       corelib_x11_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_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_activex.o \
+       corelib_msw_app.o \
+       corelib_msw_bitmap.o \
+       corelib_msw_brush.o \
+       corelib_msw_caret.o \
+       corelib_msw_clipbrd.o \
+       corelib_msw_colour.o \
+       corelib_msw_cursor.o \
+       corelib_msw_data.o \
+       corelib_msw_dc.o \
+       corelib_msw_dcclient.o \
+       corelib_msw_dcmemory.o \
+       corelib_msw_dcprint.o \
+       corelib_msw_dcscreen.o \
+       corelib_msw_dialup.o \
         corelib_dib.o \
         corelib_dib.o \
-       corelib_display.o \
+       corelib_msw_display.o \
         corelib_enhmeta.o \
         corelib_enhmeta.o \
-       corelib_font.o \
-       corelib_fontenum.o \
-       corelib_fontutil.o \
-       corelib_gdiimage.o \
-       corelib_gdiobj.o \
+       corelib_msw_font.o \
+       corelib_msw_fontenum.o \
+       corelib_msw_fontutil.o \
+       corelib_msw_gdiimage.o \
+       corelib_msw_gdiobj.o \
         corelib_gdiplus.o \
         corelib_gdiplus.o \
-       corelib_graphics.o \
-       corelib_icon.o \
-       corelib_imaglist.o \
-       corelib_minifram.o \
-       corelib_dataobj.o \
+       corelib_msw_graphics.o \
+       corelib_msw_icon.o \
+       corelib_msw_imaglist.o \
+       corelib_msw_minifram.o \
+       corelib_ole_dataobj.o \
         corelib_dropsrc.o \
         corelib_droptgt.o \
         corelib_oleutils.o \
         corelib_dropsrc.o \
         corelib_droptgt.o \
         corelib_oleutils.o \
-       corelib_palette.o \
-       corelib_pen.o \
-       corelib_popupwin.o \
-       corelib_printdlg.o \
+       corelib_msw_palette.o \
+       corelib_msw_pen.o \
+       corelib_msw_popupwin.o \
+       corelib_msw_printdlg.o \
         corelib_printwin.o \
         corelib_printwin.o \
-       corelib_region.o \
-       corelib_renderer.o \
-       corelib_settings.o \
-       corelib_tooltip.o \
-       corelib_toplevel.o \
-       corelib_utilsgui.o \
+       corelib_msw_region.o \
+       corelib_msw_renderer.o \
+       corelib_msw_settings.o \
+       corelib_msw_tooltip.o \
+       corelib_msw_toplevel.o \
+       corelib_uiaction.o \
+       corelib_msw_utilsgui.o \
         corelib_uxtheme.o \
         corelib_uxtheme.o \
-       corelib_window.o \
+       corelib_msw_window.o \
         corelib_helpchm.o \
         corelib_helpchm.o \
-       corelib_helpwin.o \
+       corelib_msw_helpwin.o \
         corelib_automtn.o \
         corelib_uuid.o
  @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6)
  @COND_TOOLKIT_OSX_CARBON@__LOWLEVEL_SRC_OBJECTS_6 \
         corelib_automtn.o \
         corelib_uuid.o
  @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6)
  @COND_TOOLKIT_OSX_CARBON@__LOWLEVEL_SRC_OBJECTS_6 \
-@COND_TOOLKIT_OSX_CARBON@      = $(__OSX_LOWLEVEL_SRC_OBJECTS_1_4)
+@COND_TOOLKIT_OSX_CARBON@      = $(__OSX_LOWLEVEL_SRC_OBJECTS_2_2)
  @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_6 = \
  @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_6 = \
-@COND_TOOLKIT_OSX_COCOA@       $(__OSX_LOWLEVEL_SRC_OBJECTS_1_4)
+@COND_TOOLKIT_OSX_COCOA@       $(__OSX_LOWLEVEL_SRC_OBJECTS_2_2)
+@COND_TOOLKIT_OSX_IPHONE@__LOWLEVEL_SRC_OBJECTS_6 \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__OSX_LOWLEVEL_SRC_OBJECTS_2_2)
  @COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_6 = 
  COND_TOOLKIT_WINCE___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_activex.o \
+       corelib_msw_app.o \
+       corelib_msw_bitmap.o \
+       corelib_msw_brush.o \
+       corelib_msw_caret.o \
+       corelib_msw_clipbrd.o \
+       corelib_msw_colour.o \
+       corelib_msw_cursor.o \
+       corelib_msw_data.o \
+       corelib_msw_dc.o \
+       corelib_msw_dcclient.o \
+       corelib_msw_dcmemory.o \
+       corelib_msw_dcprint.o \
+       corelib_msw_dcscreen.o \
+       corelib_msw_dialup.o \
         corelib_dib.o \
         corelib_dib.o \
-       corelib_display.o \
+       corelib_msw_display.o \
         corelib_enhmeta.o \
         corelib_enhmeta.o \
-       corelib_font.o \
-       corelib_fontenum.o \
-       corelib_fontutil.o \
-       corelib_gdiimage.o \
-       corelib_gdiobj.o \
+       corelib_msw_font.o \
+       corelib_msw_fontenum.o \
+       corelib_msw_fontutil.o \
+       corelib_msw_gdiimage.o \
+       corelib_msw_gdiobj.o \
         corelib_gdiplus.o \
         corelib_gdiplus.o \
-       corelib_graphics.o \
-       corelib_icon.o \
-       corelib_imaglist.o \
-       corelib_minifram.o \
-       corelib_dataobj.o \
+       corelib_msw_graphics.o \
+       corelib_msw_icon.o \
+       corelib_msw_imaglist.o \
+       corelib_msw_minifram.o \
+       corelib_ole_dataobj.o \
         corelib_dropsrc.o \
         corelib_droptgt.o \
         corelib_oleutils.o \
         corelib_dropsrc.o \
         corelib_droptgt.o \
         corelib_oleutils.o \
-       corelib_palette.o \
-       corelib_pen.o \
-       corelib_popupwin.o \
-       corelib_printdlg.o \
+       corelib_msw_palette.o \
+       corelib_msw_pen.o \
+       corelib_msw_popupwin.o \
+       corelib_msw_printdlg.o \
         corelib_printwin.o \
         corelib_printwin.o \
-       corelib_region.o \
-       corelib_renderer.o \
-       corelib_settings.o \
-       corelib_tooltip.o \
-       corelib_toplevel.o \
-       corelib_utilsgui.o \
+       corelib_msw_region.o \
+       corelib_msw_renderer.o \
+       corelib_msw_settings.o \
+       corelib_msw_tooltip.o \
+       corelib_msw_toplevel.o \
+       corelib_uiaction.o \
+       corelib_msw_utilsgui.o \
         corelib_uxtheme.o \
         corelib_uxtheme.o \
-       corelib_window.o
+       corelib_msw_window.o
  @COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_6)
  COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_6 =  \
  @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_imaglist.o \
-       corelib_dialup.o \
-       corelib_fontenum.o \
-       corelib_fontutil.o \
-       corelib_utilsx11.o \
+       corelib_generic_caret.o \
+       corelib_generic_imaglist.o \
+       corelib_unix_dialup.o \
         corelib_displayx11.o \
         corelib_displayx11.o \
-       corelib_icon.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_minifram.o \
+       corelib_unix_fontenum.o \
+       corelib_unix_fontutil.o \
+       corelib_uiactionx11.o \
+       corelib_utilsx11.o \
+       corelib_generic_icon.o \
+       corelib_generic_timer.o \
+       corelib_x11_app.o \
+       corelib_x11_bitmap.o \
+       corelib_x11_brush.o \
+       corelib_x11_clipbrd.o \
+       corelib_x11_colour.o \
+       corelib_x11_cursor.o \
+       corelib_x11_data.o \
+       corelib_x11_dataobj.o \
+       corelib_x11_dc.o \
+       corelib_x11_dcclient.o \
+       corelib_x11_dcmemory.o \
+       corelib_x11_dcscreen.o \
+       corelib_x11_evtloop.o \
+       corelib_x11_font.o \
+       corelib_x11_minifram.o \
         corelib_nanox.o \
         corelib_nanox.o \
-       corelib_palette.o \
-       corelib_pen.o \
-       corelib_popupwin.o \
-       corelib_region.o \
+       corelib_x11_palette.o \
+       corelib_x11_pen.o \
+       corelib_x11_popupwin.o \
+       corelib_x11_region.o \
         corelib_reparent.o \
         corelib_reparent.o \
-       corelib_settings.o \
-       corelib_toplevel.o \
-       corelib_utils.o \
+       corelib_x11_settings.o \
+       corelib_x11_toplevel.o \
+       corelib_x11_utils.o \
         corelib_utilsx.o \
         corelib_utilsx.o \
-       corelib_window.o
+       corelib_x11_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 \
  @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_6)
  COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 =  \
         corelib_NSBox.o \
@@ -9865,256 +10901,252 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 =  \
         corelib_NSView.o \
         corelib_NSWindow.o \
         corelib_ObjcRef.o \
         corelib_NSView.o \
         corelib_NSWindow.o \
         corelib_ObjcRef.o \
-       corelib_app.o \
-       corelib_bitmap.o \
-       corelib_bmpbuttn.o \
-       corelib_brush.o \
-       corelib_button.o \
-       corelib_checkbox.o \
-       corelib_checklst.o \
-       corelib_choice.o \
-       corelib_clipbrd.o \
-       corelib_colordlg.o \
-       corelib_colour.o \
-       corelib_combobox.o \
-       corelib_control.o \
-       corelib_cursor.o \
-       corelib_data.o \
-       corelib_dataobj.o \
-       corelib_dc.o \
-       corelib_dcclient.o \
-       corelib_dcmemory.o \
-       corelib_dcscreen.o \
-       corelib_dialog.o \
-       corelib_dirdlg.o \
-       corelib_display.o \
+       corelib_cocoa_app.o \
+       corelib_cocoa_bitmap.o \
+       corelib_cocoa_bmpbuttn.o \
+       corelib_cocoa_brush.o \
+       corelib_src_cocoa_button.o \
+       corelib_src_cocoa_checkbox.o \
+       corelib_cocoa_checklst.o \
+       corelib_src_cocoa_choice.o \
+       corelib_cocoa_clipbrd.o \
+       corelib_cocoa_colordlg.o \
+       corelib_src_cocoa_colour.o \
+       corelib_src_cocoa_combobox.o \
+       corelib_cocoa_control.o \
+       corelib_cocoa_cursor.o \
+       corelib_cocoa_data.o \
+       corelib_cocoa_dataobj.o \
+       corelib_cocoa_dc.o \
+       corelib_cocoa_dcclient.o \
+       corelib_cocoa_dcmemory.o \
+       corelib_cocoa_dcscreen.o \
+       corelib_src_cocoa_dialog.o \
+       corelib_src_cocoa_dirdlg.o \
+       corelib_cocoa_display.o \
         corelib_drawer.o \
         corelib_drawer.o \
-       corelib_evtloop.o \
-       corelib_filedlg.o \
-       corelib_font.o \
-       corelib_fontdlg.o \
-       corelib_fontenum.o \
-       corelib_fontutil.o \
-       corelib_frame.o \
-       corelib_gauge.o \
-       corelib_icon.o \
-       corelib_listbox.o \
-       corelib_main.o \
+       corelib_src_cocoa_evtloop.o \
+       corelib_src_cocoa_filedlg.o \
+       corelib_cocoa_font.o \
+       corelib_cocoa_fontdlg.o \
+       corelib_cocoa_fontenum.o \
+       corelib_cocoa_fontutil.o \
+       corelib_cocoa_frame.o \
+       corelib_src_cocoa_gauge.o \
+       corelib_cocoa_icon.o \
+       corelib_src_cocoa_listbox.o \
+       corelib_cocoa_main.o \
         corelib_mbarman.o \
         corelib_mbarman.o \
-       corelib_mdi.o \
-       corelib_menu.o \
-       corelib_menuitem.o \
-       corelib_msgdlg.o \
-       corelib_notebook.o \
-       corelib_pen.o \
-       corelib_radiobox.o \
-       corelib_radiobut.o \
-       corelib_region.o \
-       corelib_scrolbar.o \
-       corelib_settings.o \
-       corelib_slider.o \
+       corelib_cocoa_mdi.o \
+       corelib_src_cocoa_menu.o \
+       corelib_src_cocoa_menuitem.o \
+       corelib_src_cocoa_msgdlg.o \
+       corelib_src_cocoa_notebook.o \
+       corelib_cocoa_pen.o \
+       corelib_cocoa_radiobox.o \
+       corelib_src_cocoa_radiobut.o \
+       corelib_cocoa_region.o \
+       corelib_src_cocoa_scrolbar.o \
+       corelib_cocoa_settings.o \
+       corelib_src_cocoa_slider.o \
         corelib_sound.o \
         corelib_sound.o \
-       corelib_spinbutt.o \
-       corelib_statbmp.o \
-       corelib_statbox.o \
+       corelib_src_cocoa_spinbutt.o \
+       corelib_cocoa_statbmp.o \
+       corelib_src_cocoa_statbox.o \
         corelib_statline2.o \
         corelib_statline2.o \
-       corelib_stattext.o \
-       corelib_textctrl.o \
-       corelib_timer.o \
-       corelib_toolbar.o \
-       corelib_tooltip.o \
-       corelib_toplevel.o \
-       corelib_utils.o \
+       corelib_src_cocoa_stattext.o \
+       corelib_src_cocoa_textctrl.o \
+       corelib_cocoa_timer.o \
+       corelib_src_cocoa_toolbar.o \
+       corelib_src_cocoa_tooltip.o \
+       corelib_cocoa_toplevel.o \
+       corelib_src_cocoa_utils.o \
         corelib_utilsexc.o \
         corelib_utilsexc.o \
-       corelib_window.o \
-       corelib_accel.o \
-       corelib_caret.o \
+       corelib_src_cocoa_window.o \
+       corelib_generic_accel.o \
+       corelib_generic_caret.o \
         corelib_clrpickerg.o \
         corelib_collpaneg.o \
         corelib_colrdlgg.o \
         corelib_clrpickerg.o \
         corelib_collpaneg.o \
         corelib_colrdlgg.o \
-       corelib_fdrepdlg.o \
+       corelib_generic_fdrepdlg.o \
         corelib_filepickerg.o \
         corelib_fontdlgg.o \
         corelib_fontpickerg.o \
         corelib_filepickerg.o \
         corelib_fontdlgg.o \
         corelib_fontpickerg.o \
-       corelib_imaglist.o \
-       corelib_listctrl.o \
-       corelib_msgdlgg.o \
+       corelib_generic_imaglist.o \
+       corelib_generic_listctrl.o \
         corelib_paletteg.o \
         corelib_regiong.o \
         corelib_paletteg.o \
         corelib_regiong.o \
-       corelib_statusbr.o \
-       corelib_tabg.o
+       corelib_generic_statusbr.o
  @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_3 =  \
  @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_3 =  \
-       corelib_accel.o \
+       corelib_generic_accel.o \
         corelib_clrpickerg.o \
         corelib_collpaneg.o \
         corelib_colrdlgg.o \
         corelib_dirdlgg.o \
         corelib_clrpickerg.o \
         corelib_collpaneg.o \
         corelib_colrdlgg.o \
         corelib_dirdlgg.o \
-       corelib_fdrepdlg.o \
+       corelib_generic_fdrepdlg.o \
         corelib_filedlgg.o \
         corelib_filepickerg.o \
         corelib_fontdlgg.o \
         corelib_fontpickerg.o \
         corelib_filedlgg.o \
         corelib_filepickerg.o \
         corelib_fontdlgg.o \
         corelib_fontpickerg.o \
-       corelib_listctrl.o \
-       corelib_msgdlgg.o \
+       corelib_generic_listctrl.o \
         corelib_prntdlgg.o \
         corelib_prntdlgg.o \
-       corelib_statusbr.o \
-       corelib_tabg.o \
-       corelib_bmpbuttn.o \
-       corelib_button.o \
-       corelib_checkbox.o \
-       corelib_checklst.o \
-       corelib_choice.o \
-       corelib_combobox.o \
-       corelib_control.o \
-       corelib_dialog.o \
-       corelib_filedlg.o \
-       corelib_fontdlg.o \
-       corelib_frame.o \
-       corelib_gauge.o \
-       corelib_listbox.o \
-       corelib_mdi.o \
-       corelib_menu.o \
-       corelib_notebook.o \
-       corelib_radiobox.o \
-       corelib_radiobut.o \
-       corelib_scrolbar.o \
-       corelib_scrolwin.o \
-       corelib_slider.o \
-       corelib_spinbutt.o \
-       corelib_spinctrl.o \
-       corelib_statbmp.o \
-       corelib_statbox.o \
-       corelib_statline.o \
-       corelib_stattext.o \
-       corelib_tbargtk.o \
-       corelib_textctrl.o \
-       corelib_tglbtn.o
+       corelib_generic_statusbr.o \
+       corelib_gtk1_bmpbuttn.o \
+       corelib_gtk1_button.o \
+       corelib_gtk1_checkbox.o \
+       corelib_gtk1_checklst.o \
+       corelib_gtk1_choice.o \
+       corelib_gtk1_combobox.o \
+       corelib_gtk1_control.o \
+       corelib_gtk1_dialog.o \
+       corelib_gtk1_filedlg.o \
+       corelib_gtk1_fontdlg.o \
+       corelib_gtk1_frame.o \
+       corelib_gtk1_gauge.o \
+       corelib_gtk1_listbox.o \
+       corelib_gtk1_mdi.o \
+       corelib_gtk1_menu.o \
+       corelib_gtk1_mnemonics.o \
+       corelib_gtk1_notebook.o \
+       corelib_gtk1_radiobox.o \
+       corelib_gtk1_radiobut.o \
+       corelib_gtk1_scrolbar.o \
+       corelib_gtk1_scrolwin.o \
+       corelib_gtk1_slider.o \
+       corelib_gtk1_spinbutt.o \
+       corelib_gtk1_spinctrl.o \
+       corelib_gtk1_statbmp.o \
+       corelib_gtk1_statbox.o \
+       corelib_gtk1_statline.o \
+       corelib_gtk1_stattext.o \
+       corelib_gtk1_toolbar.o \
+       corelib_gtk1_textctrl.o \
+       corelib_gtk1_tglbtn.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_3)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3 =  \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_3)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3 =  \
-       corelib_accel.o \
-       corelib_fdrepdlg.o \
+       corelib_generic_accel.o \
+       corelib_generic_fdrepdlg.o \
         corelib_filepickerg.o \
         corelib_filepickerg.o \
-       corelib_graphicc.o \
-       corelib_listctrl.o \
+       corelib_generic_listctrl.o \
         corelib_prntdlgg.o \
         corelib_prntdlgg.o \
-       corelib_statusbr.o \
-       corelib_tabg.o \
+       corelib_generic_statusbr.o \
         corelib_fontdlgg.o \
         corelib_fontdlgg.o \
-       corelib_msgdlgg.o \
+       corelib_gtk_anybutton.o \
         corelib_artgtk.o \
         corelib_artgtk.o \
-       corelib_bmpbuttn.o \
-       corelib_button.o \
-       corelib_checkbox.o \
-       corelib_checklst.o \
-       corelib_choice.o \
+       corelib_gtk_bmpbuttn.o \
+       corelib_gtk_button.o \
+       corelib_gtk_checkbox.o \
+       corelib_gtk_checklst.o \
+       corelib_gtk_choice.o \
         corelib_collpane.o \
         corelib_collpane.o \
-       corelib_colordlg.o \
-       corelib_combobox.o \
-       corelib_control.o \
+       corelib_gtk_colordlg.o \
+       corelib_gtk_combobox.o \
+       corelib_gtk_control.o \
         corelib_clrpicker.o \
         corelib_clrpicker.o \
-       corelib_dialog.o \
+       corelib_gtk_dialog.o \
         corelib_fontpicker.o \
         corelib_filepicker.o \
         corelib_fontpicker.o \
         corelib_filepicker.o \
-       corelib_dirdlg.o \
-       corelib_filedlg.o \
-       corelib_fontdlg.o \
-       corelib_frame.o \
-       corelib_gauge.o \
+       corelib_gtk_dirdlg.o \
+       corelib_gtk_filedlg.o \
+       corelib_gtk_fontdlg.o \
+       corelib_gtk_frame.o \
+       corelib_gtk_gauge.o \
         corelib_gprint.o \
         corelib_gvfs.o \
         corelib_gprint.o \
         corelib_gvfs.o \
-       corelib_print.o \
-       corelib_listbox.o \
-       corelib_mdi.o \
-       corelib_menu.o \
-       corelib_mnemonics.o \
-       corelib_msgdlg.o \
-       corelib_nativewin.o \
-       corelib_notebook.o \
-       corelib_radiobox.o \
-       corelib_radiobut.o \
-       corelib_scrolbar.o \
-       corelib_scrolwin.o \
-       corelib_slider.o \
-       corelib_spinbutt.o \
-       corelib_spinctrl.o \
-       corelib_statbmp.o \
-       corelib_statbox.o \
-       corelib_statline.o \
-       corelib_stattext.o \
-       corelib_tbargtk.o \
-       corelib_textctrl.o \
-       corelib_textentry.o \
-       corelib_tglbtn.o \
+       corelib_gtk_infobar.o \
+       corelib_gtk_listbox.o \
+       corelib_gtk_mdi.o \
+       corelib_gtk_menu.o \
+       corelib_gtk_mnemonics.o \
+       corelib_gtk_msgdlg.o \
+       corelib_gtk_nativewin.o \
+       corelib_gtk_notebook.o \
+       corelib_gtk_print.o \
+       corelib_gtk_radiobox.o \
+       corelib_gtk_radiobut.o \
+       corelib_gtk_scrolbar.o \
+       corelib_gtk_scrolwin.o \
+       corelib_gtk_slider.o \
+       corelib_gtk_spinbutt.o \
+       corelib_gtk_spinctrl.o \
+       corelib_gtk_statbmp.o \
+       corelib_gtk_statbox.o \
+       corelib_gtk_statline.o \
+       corelib_gtk_stattext.o \
+       corelib_gtk_toolbar.o \
+       corelib_gtk_textctrl.o \
+       corelib_gtk_textentry.o \
+       corelib_gtk_tglbtn.o \
         corelib_treeentry_gtk.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3)
  COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 =  \
         corelib_treeentry_gtk.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3)
  COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 =  \
-       corelib_accel.o \
-       corelib_app.o \
-       corelib_bmpbuttn.o \
+       corelib_motif_accel.o \
+       corelib_motif_app.o \
+       corelib_motif_bmpbuttn.o \
         corelib_bmpmotif.o \
         corelib_bmpmotif.o \
-       corelib_button.o \
-       corelib_checkbox.o \
-       corelib_checklst.o \
-       corelib_choice.o \
-       corelib_clipbrd.o \
-       corelib_colour.o \
-       corelib_combobox.o \
+       corelib_motif_button.o \
+       corelib_motif_checkbox.o \
+       corelib_motif_checklst.o \
+       corelib_motif_choice.o \
+       corelib_motif_clipbrd.o \
+       corelib_motif_colour.o \
+       corelib_motif_combobox.o \
         corelib_combobox_native.o \
         corelib_combobox_native.o \
-       corelib_control.o \
-       corelib_cursor.o \
-       corelib_data.o \
-       corelib_dataobj.o \
-       corelib_dc.o \
-       corelib_dcclient.o \
-       corelib_dcmemory.o \
-       corelib_dcscreen.o \
-       corelib_dialog.o \
-       corelib_evtloop.o \
-       corelib_filedlg.o \
-       corelib_font.o \
-       corelib_frame.o \
-       corelib_gauge.o \
-       corelib_gsockmot.o \
-       corelib_icon.o \
-       corelib_listbox.o \
-       corelib_main.o \
-       corelib_mdi.o \
-       corelib_menu.o \
-       corelib_menuitem.o \
-       corelib_minifram.o \
-       corelib_msgdlg.o \
-       corelib_popupwin.o \
-       corelib_radiobox.o \
-       corelib_radiobut.o \
-       corelib_scrolbar.o \
-       corelib_settings.o \
-       corelib_slider.o \
-       corelib_spinbutt.o \
-       corelib_statbmp.o \
-       corelib_statbox.o \
-       corelib_stattext.o \
-       corelib_textctrl.o \
-       corelib_textentry.o \
-       corelib_timer.o \
-       corelib_toolbar.o \
-       corelib_toplevel.o \
-       corelib_utils.o \
-       corelib_window.o \
+       corelib_motif_control.o \
+       corelib_motif_cursor.o \
+       corelib_motif_data.o \
+       corelib_motif_dataobj.o \
+       corelib_motif_dc.o \
+       corelib_motif_dcclient.o \
+       corelib_motif_dcmemory.o \
+       corelib_motif_dcscreen.o \
+       corelib_motif_dialog.o \
+       corelib_motif_evtloop.o \
+       corelib_motif_filedlg.o \
+       corelib_motif_font.o \
+       corelib_motif_frame.o \
+       corelib_motif_gauge.o \
+       corelib_sockmot.o \
+       corelib_motif_icon.o \
+       corelib_motif_listbox.o \
+       corelib_motif_main.o \
+       corelib_motif_menu.o \
+       corelib_motif_menuitem.o \
+       corelib_motif_minifram.o \
+       corelib_motif_msgdlg.o \
+       corelib_motif_popupwin.o \
+       corelib_motif_radiobox.o \
+       corelib_motif_radiobut.o \
+       corelib_motif_scrolbar.o \
+       corelib_motif_settings.o \
+       corelib_motif_slider.o \
+       corelib_motif_spinbutt.o \
+       corelib_motif_statbmp.o \
+       corelib_motif_statbox.o \
+       corelib_motif_stattext.o \
+       corelib_motif_textctrl.o \
+       corelib_motif_textentry.o \
+       corelib_motif_timer.o \
+       corelib_motif_toolbar.o \
+       corelib_motif_toplevel.o \
+       corelib_motif_utils.o \
+       corelib_motif_window.o \
         corelib_xmcombo.o \
         corelib_clrpickerg.o \
         corelib_collpaneg.o \
         corelib_colrdlgg.o \
         corelib_dirdlgg.o \
         corelib_xmcombo.o \
         corelib_clrpickerg.o \
         corelib_collpaneg.o \
         corelib_colrdlgg.o \
         corelib_dirdlgg.o \
-       corelib_fdrepdlg.o \
+       corelib_generic_fdrepdlg.o \
         corelib_filepickerg.o \
         corelib_fontdlgg.o \
         corelib_fontpickerg.o \
         corelib_filepickerg.o \
         corelib_fontdlgg.o \
         corelib_fontpickerg.o \
-       corelib_listctrl.o \
-       corelib_notebook.o \
+       corelib_generic_listctrl.o \
+       corelib_mdig.o \
+       corelib_generic_notebook.o \
         corelib_prntdlgg.o \
         corelib_prntdlgg.o \
-       corelib_statline.o \
-       corelib_statusbr.o \
+       corelib_generic_statline.o \
+       corelib_generic_statusbr.o \
         corelib_tabg.o
  @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3)
  COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 =  \
         corelib_tabg.o
  @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3)
  COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 =  \
@@ -10122,291 +11154,302 @@ COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 =  \
         corelib_collpaneg.o \
         corelib_filepickerg.o \
         corelib_fontpickerg.o \
         corelib_collpaneg.o \
         corelib_filepickerg.o \
         corelib_fontpickerg.o \
-       corelib_statusbr.o \
+       corelib_generic_statusbr.o \
         corelib_prntdlgg.o \
         corelib_prntdlgg.o \
-       corelib_accel.o \
-       corelib_bmpbuttn.o \
-       corelib_button.o \
-       corelib_checkbox.o \
-       corelib_choice.o \
-       corelib_colordlg.o \
+       corelib_msw_accel.o \
+       corelib_msw_anybutton.o \
+       corelib_artmsw.o \
+       corelib_msw_bmpbuttn.o \
+       corelib_msw_button.o \
+       corelib_msw_checkbox.o \
+       corelib_msw_choice.o \
+       corelib_msw_colordlg.o \
         corelib_combo.o \
         corelib_combo.o \
-       corelib_combobox.o \
-       corelib_control.o \
-       corelib_dialog.o \
-       corelib_dirdlg.o \
+       corelib_msw_combobox.o \
+       corelib_msw_control.o \
+       corelib_msw_dialog.o \
+       corelib_msw_dirdlg.o \
         corelib_dragimag.o \
         corelib_dragimag.o \
-       corelib_filedlg.o \
-       corelib_frame.o \
-       corelib_gauge.o \
-       corelib_iniconf.o \
-       corelib_listbox.o \
-       corelib_listctrl.o \
-       corelib_mdi.o \
-       corelib_menu.o \
-       corelib_menuitem.o \
-       corelib_metafile.o \
-       corelib_msgdlg.o \
-       corelib_nativdlg.o \
-       corelib_nativewin.o \
-       corelib_notebook.o \
+       corelib_msw_filedlg.o \
+       corelib_msw_frame.o \
+       corelib_msw_gauge.o \
+       corelib_headerctrl.o \
+       corelib_msw_iniconf.o \
+       corelib_msw_listbox.o \
+       corelib_msw_listctrl.o \
+       corelib_msw_mdi.o \
+       corelib_msw_menu.o \
+       corelib_msw_menuitem.o \
+       corelib_msw_metafile.o \
+       corelib_msw_msgdlg.o \
+       corelib_msw_nativdlg.o \
+       corelib_msw_nativewin.o \
+       corelib_msw_notebook.o \
         corelib_access.o \
         corelib_access.o \
-       corelib_ownerdrw.o \
-       corelib_radiobox.o \
-       corelib_radiobut.o \
-       corelib_scrolbar.o \
-       corelib_slider.o \
-       corelib_spinbutt.o \
-       corelib_spinctrl.o \
-       corelib_statbmp.o \
-       corelib_statbox.o \
+       corelib_msw_ownerdrw.o \
+       corelib_panel.o \
+       corelib_progdlg.o \
+       corelib_msw_radiobox.o \
+       corelib_msw_radiobut.o \
+       corelib_richmsgdlg.o \
+       corelib_msw_scrolbar.o \
+       corelib_msw_slider.o \
+       corelib_msw_spinbutt.o \
+       corelib_msw_spinctrl.o \
+       corelib_msw_statbmp.o \
+       corelib_msw_statbox.o \
         corelib_statusbar.o \
         corelib_statusbar.o \
-       corelib_statline.o \
-       corelib_stattext.o \
-       corelib_tabctrl.o \
-       corelib_toolbar.o \
-       corelib_textctrl.o \
-       corelib_textentry.o \
-       corelib_tglbtn.o \
+       corelib_msw_statline.o \
+       corelib_msw_stattext.o \
+       corelib_msw_toolbar.o \
+       corelib_msw_textctrl.o \
+       corelib_msw_textentry.o \
+       corelib_msw_tglbtn.o \
         corelib_treectrl.o \
         corelib_treectrl.o \
-       corelib_checklst.o \
-       corelib_fdrepdlg.o \
-       corelib_fontdlg.o
+       corelib_msw_checklst.o \
+       corelib_msw_fdrepdlg.o \
+       corelib_msw_fontdlg.o
  @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3)
  COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_3 =  \
  @COND_TOOLKIT_MSW@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3)
  COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_3 =  \
-       $(__OSX_CARBON_COCOA_SRC_OBJECTS_9) \
-       corelib_bmpbuttn.o \
-       corelib_button.o \
-       corelib_checkbox.o \
-       corelib_choice.o \
-       corelib_colordlg.o \
-       corelib_dialog.o \
-       corelib_dirdlg.o \
-       corelib_evtloop.o \
-       corelib_filedlg.o \
-       corelib_gauge.o \
-       corelib_listbox.o \
+       $(__OSX_CARBON_COCOA_SRC_OBJECTS_1_0) \
+       corelib_carbon_anybutton.o \
+       corelib_carbon_bmpbuttn.o \
+       corelib_carbon_button.o \
+       corelib_carbon_checkbox.o \
+       corelib_carbon_choice.o \
+       corelib_carbon_colordlg.o \
+       corelib_carbon_dialog.o \
+       corelib_carbon_dirdlg.o \
+       corelib_carbon_dnd.o \
+       corelib_carbon_evtloop.o \
+       corelib_carbon_filedlg.o \
+       corelib_carbon_gauge.o \
+       corelib_carbon_listbox.o \
         corelib_listctrl_mac.o \
         corelib_listctrl_mac.o \
-       corelib_mdi.o \
-       corelib_menu.o \
-       corelib_menuitem.o \
-       corelib_msgdlg.o \
-       corelib_nonownedwnd.o \
+       corelib_carbon_menu.o \
+       corelib_carbon_menuitem.o \
+       corelib_carbon_msgdlg.o \
+       corelib_carbon_nonownedwnd.o \
         corelib_notebmac.o \
         corelib_notebmac.o \
-       corelib_radiobut.o \
-       corelib_region.o \
-       corelib_scrolbar.o \
-       corelib_slider.o \
-       corelib_spinbutt.o \
-       corelib_srchctrl.o \
-       corelib_statbmp.o \
-       corelib_statbox.o \
+       corelib_carbon_printdlg.o \
+       corelib_carbon_radiobut.o \
+       corelib_carbon_scrolbar.o \
+       corelib_carbon_slider.o \
+       corelib_carbon_spinbutt.o \
+       corelib_carbon_srchctrl.o \
+       corelib_carbon_statbmp.o \
+       corelib_carbon_statbox.o \
         corelib_statlmac.o \
         corelib_statlmac.o \
-       corelib_stattext.o \
-       corelib_textctrl.o \
-       corelib_tglbtn.o \
-       corelib_toolbar.o \
-       corelib_window.o \
-       corelib_webkit.o \
-       corelib_caret.o \
-       corelib_clrpickerg.o \
-       corelib_collpaneg.o \
-       corelib_fdrepdlg.o \
-       corelib_filepickerg.o \
-       corelib_fontdlgg.o \
-       corelib_fontpickerg.o \
-       corelib_listctrl.o \
-       corelib_prntdlgg.o \
-       corelib_statusbr.o \
-       corelib_tabg.o
+       corelib_carbon_stattext.o \
+       corelib_carbon_textctrl.o \
+       corelib_carbon_tglbtn.o \
+       corelib_carbon_toolbar.o \
+       corelib_carbon_tooltip.o \
+       corelib_carbon_window.o
  @COND_TOOLKIT_OSX_CARBON@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_3)
  COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_3 =  \
  @COND_TOOLKIT_OSX_CARBON@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_OSX_CARBON___GUI_SRC_OBJECTS_3)
  COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_3 =  \
-       $(__OSX_CARBON_COCOA_SRC_OBJECTS_9) \
-       corelib_bmpbuttn.o \
-       corelib_button.o \
-       corelib_checkbox.o \
-       corelib_choice.o \
-       corelib_dialog.o \
-       corelib_dirdlg.o \
-       corelib_evtloop.o \
-       corelib_filedlg.o \
-       corelib_gauge.o \
-       corelib_glcanvas.o \
-       corelib_listbox.o \
-       corelib_menu.o \
-       corelib_menuitem.o \
-       corelib_msgdlg.o \
-       corelib_nonownedwnd.o \
-       corelib_notebook.o \
-       corelib_radiobut.o \
-       corelib_scrolbar.o \
-       corelib_slider.o \
-       corelib_spinbutt.o \
-       corelib_srchctrl.o \
-       corelib_statbox.o \
-       corelib_statline.o \
-       corelib_stattext.o \
-       corelib_textctrl.o \
-       corelib_tglbtn.o \
-       corelib_toolbar.o \
-       corelib_window.o \
-       corelib_caret.o \
-       corelib_clrpickerg.o \
-       corelib_collpaneg.o \
-       corelib_fdrepdlg.o \
-       corelib_filepickerg.o \
-       corelib_fontdlgg.o \
-       corelib_fontpickerg.o \
-       corelib_listctrl.o \
-       corelib_prntdlgg.o \
-       corelib_regiong.o \
-       corelib_statusbr.o \
-       corelib_tabg.o
+       $(__OSX_CARBON_COCOA_SRC_OBJECTS_1_0) \
+       corelib_cocoa_anybutton.o \
+       corelib_osx_cocoa_button.o \
+       corelib_osx_cocoa_checkbox.o \
+       corelib_osx_cocoa_choice.o \
+       corelib_osx_cocoa_colour.o \
+       corelib_osx_cocoa_combobox.o \
+       corelib_osx_cocoa_dialog.o \
+       corelib_osx_cocoa_dirdlg.o \
+       corelib_cocoa_dnd.o \
+       corelib_osx_cocoa_evtloop.o \
+       corelib_osx_cocoa_filedlg.o \
+       corelib_osx_cocoa_gauge.o \
+       corelib_osx_cocoa_listbox.o \
+       corelib_osx_cocoa_menu.o \
+       corelib_osx_cocoa_menuitem.o \
+       corelib_osx_cocoa_msgdlg.o \
+       corelib_cocoa_nonownedwnd.o \
+       corelib_osx_cocoa_notebook.o \
+       corelib_osx_cocoa_radiobut.o \
+       corelib_cocoa_printdlg.o \
+       corelib_osx_cocoa_scrolbar.o \
+       corelib_osx_cocoa_slider.o \
+       corelib_osx_cocoa_spinbutt.o \
+       corelib_cocoa_srchctrl.o \
+       corelib_osx_cocoa_statbox.o \
+       corelib_cocoa_statline.o \
+       corelib_osx_cocoa_stattext.o \
+       corelib_osx_cocoa_textctrl.o \
+       corelib_cocoa_tglbtn.o \
+       corelib_osx_cocoa_toolbar.o \
+       corelib_osx_cocoa_tooltip.o \
+       corelib_osx_cocoa_window.o
  @COND_TOOLKIT_OSX_COCOA@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_3)
  @COND_TOOLKIT_OSX_COCOA@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_3)
+COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_3 =  \
+       $(__OSX_CARBON_COCOA_SRC_OBJECTS_1_0) \
+       corelib_regiong.o \
+       corelib_generic_icon.o \
+       corelib_iphone_anybutton.o \
+       corelib_iphone_button.o \
+       corelib_iphone_checkbox.o \
+       corelib_iphone_dialog.o \
+       corelib_iphone_evtloop.o \
+       corelib_iphone_gauge.o \
+       corelib_iphone_msgdlg.o \
+       corelib_iphone_nonownedwnd.o \
+       corelib_iphone_scrolbar.o \
+       corelib_iphone_slider.o \
+       corelib_iphone_stattext.o \
+       corelib_iphone_textctrl.o \
+       corelib_iphone_toolbar.o \
+       corelib_iphone_utils.o \
+       corelib_iphone_window.o
+@COND_TOOLKIT_OSX_IPHONE@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_OSX_IPHONE___GUI_SRC_OBJECTS_3)
  COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3 =  \
  COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3 =  \
-       corelib_caret.o \
+       corelib_generic_caret.o \
         corelib_clrpickerg.o \
         corelib_collpaneg.o \
         corelib_colrdlgg.o \
         corelib_dirdlgg.o \
         corelib_clrpickerg.o \
         corelib_collpaneg.o \
         corelib_colrdlgg.o \
         corelib_dirdlgg.o \
-       corelib_fdrepdlg.o \
+       corelib_generic_fdrepdlg.o \
         corelib_filepickerg.o \
         corelib_fontpickerg.o \
         corelib_filepickerg.o \
         corelib_fontpickerg.o \
-       corelib_imaglist.o \
-       corelib_listctrl.o \
+       corelib_generic_imaglist.o \
+       corelib_generic_listctrl.o \
         corelib_mdig.o \
         corelib_prntdlgg.o \
         corelib_mdig.o \
         corelib_prntdlgg.o \
-       corelib_statusbr.o \
-       corelib_accel.o \
-       corelib_app.o \
-       corelib_bitmap.o \
-       corelib_bmpbuttn.o \
-       corelib_brush.o \
-       corelib_button.o \
-       corelib_checkbox.o \
-       corelib_checklst.o \
-       corelib_choice.o \
-       corelib_clipbrd.o \
-       corelib_colour.o \
-       corelib_combobox.o \
-       corelib_control.o \
-       corelib_cursor.o \
-       corelib_data.o \
-       corelib_dataobj.o \
-       corelib_dc.o \
-       corelib_dcclient.o \
-       corelib_dcmemory.o \
-       corelib_dcprint.o \
-       corelib_dcscreen.o \
-       corelib_dialog.o \
-       corelib_dnd.o \
-       corelib_evtloop.o \
-       corelib_filedlg.o \
-       corelib_font.o \
-       corelib_fontdlg.o \
-       corelib_fontenum.o \
-       corelib_fontutil.o \
-       corelib_frame.o \
-       corelib_gauge.o \
-       corelib_gdiimage.o \
-       corelib_gsockpm.o \
-       corelib_helpwin.o \
-       corelib_icon.o \
-       corelib_iniconf.o \
-       corelib_listbox.o \
-       corelib_main.o \
-       corelib_menu.o \
-       corelib_menuitem.o \
-       corelib_metafile.o \
-       corelib_minifram.o \
-       corelib_msgdlg.o \
-       corelib_nativdlg.o \
-       corelib_notebook.o \
-       corelib_ownerdrw.o \
-       corelib_palette.o \
-       corelib_pen.o \
-       corelib_popupwin.o \
-       corelib_print.o \
-       corelib_radiobox.o \
-       corelib_radiobut.o \
-       corelib_region.o \
-       corelib_scrolbar.o \
-       corelib_settings.o \
-       corelib_slider.o \
-       corelib_spinbutt.o \
-       corelib_spinctrl.o \
-       corelib_statbmp.o \
-       corelib_statbox.o \
-       corelib_statline.o \
-       corelib_stattext.o \
-       corelib_tabctrl.o \
-       corelib_textctrl.o \
-       corelib_textentry.o \
-       corelib_tglbtn.o \
-       corelib_timer.o \
-       corelib_toolbar.o \
-       corelib_tooltip.o \
-       corelib_toplevel.o \
-       corelib_utilsgui.o \
-       corelib_window.o
+       corelib_generic_statusbr.o \
+       corelib_os2_accel.o \
+       corelib_os2_app.o \
+       corelib_os2_bitmap.o \
+       corelib_os2_bmpbuttn.o \
+       corelib_os2_brush.o \
+       corelib_os2_button.o \
+       corelib_os2_checkbox.o \
+       corelib_os2_checklst.o \
+       corelib_os2_choice.o \
+       corelib_os2_clipbrd.o \
+       corelib_os2_colour.o \
+       corelib_os2_combobox.o \
+       corelib_os2_control.o \
+       corelib_os2_cursor.o \
+       corelib_os2_data.o \
+       corelib_os2_dataobj.o \
+       corelib_os2_dc.o \
+       corelib_os2_dcclient.o \
+       corelib_os2_dcmemory.o \
+       corelib_os2_dcprint.o \
+       corelib_os2_dcscreen.o \
+       corelib_os2_dialog.o \
+       corelib_os2_dnd.o \
+       corelib_os2_evtloop.o \
+       corelib_os2_filedlg.o \
+       corelib_os2_font.o \
+       corelib_os2_fontdlg.o \
+       corelib_os2_fontenum.o \
+       corelib_os2_fontutil.o \
+       corelib_os2_frame.o \
+       corelib_os2_gauge.o \
+       corelib_os2_gdiimage.o \
+       corelib_sockpm.o \
+       corelib_os2_helpwin.o \
+       corelib_os2_icon.o \
+       corelib_os2_iniconf.o \
+       corelib_os2_listbox.o \
+       corelib_os2_main.o \
+       corelib_os2_menu.o \
+       corelib_os2_menuitem.o \
+       corelib_os2_metafile.o \
+       corelib_os2_minifram.o \
+       corelib_os2_msgdlg.o \
+       corelib_os2_nativdlg.o \
+       corelib_os2_notebook.o \
+       corelib_os2_ownerdrw.o \
+       corelib_os2_palette.o \
+       corelib_os2_pen.o \
+       corelib_os2_popupwin.o \
+       corelib_os2_print.o \
+       corelib_os2_radiobox.o \
+       corelib_os2_radiobut.o \
+       corelib_os2_region.o \
+       corelib_os2_scrolbar.o \
+       corelib_os2_settings.o \
+       corelib_os2_slider.o \
+       corelib_os2_spinbutt.o \
+       corelib_os2_spinctrl.o \
+       corelib_os2_statbmp.o \
+       corelib_os2_statbox.o \
+       corelib_os2_statline.o \
+       corelib_os2_stattext.o \
+       corelib_os2_textctrl.o \
+       corelib_os2_textentry.o \
+       corelib_os2_tglbtn.o \
+       corelib_os2_timer.o \
+       corelib_os2_toolbar.o \
+       corelib_os2_tooltip.o \
+       corelib_os2_toplevel.o \
+       corelib_os2_utilsgui.o \
+       corelib_os2_window.o
  @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3)
  COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 =  \
         corelib_clrpickerg.o \
         corelib_collpaneg.o \
         corelib_filepickerg.o \
         corelib_fontpickerg.o \
  @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3)
  COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 =  \
         corelib_clrpickerg.o \
         corelib_collpaneg.o \
         corelib_filepickerg.o \
         corelib_fontpickerg.o \
-       corelib_statusbr.o \
+       corelib_generic_statusbr.o \
         corelib_prntdlgg.o \
         corelib_prntdlgg.o \
-       corelib_accel.o \
-       corelib_bmpbuttn.o \
-       corelib_button.o \
-       corelib_checkbox.o \
-       corelib_choice.o \
-       corelib_colordlg.o \
+       corelib_msw_accel.o \
+       corelib_msw_anybutton.o \
+       corelib_artmsw.o \
+       corelib_msw_bmpbuttn.o \
+       corelib_msw_button.o \
+       corelib_msw_checkbox.o \
+       corelib_msw_choice.o \
+       corelib_msw_colordlg.o \
         corelib_combo.o \
         corelib_combo.o \
-       corelib_combobox.o \
-       corelib_control.o \
-       corelib_dialog.o \
-       corelib_dirdlg.o \
+       corelib_msw_combobox.o \
+       corelib_msw_control.o \
+       corelib_msw_dialog.o \
+       corelib_msw_dirdlg.o \
         corelib_dragimag.o \
         corelib_dragimag.o \
-       corelib_filedlg.o \
-       corelib_frame.o \
-       corelib_gauge.o \
-       corelib_iniconf.o \
-       corelib_listbox.o \
-       corelib_listctrl.o \
-       corelib_mdi.o \
-       corelib_menu.o \
-       corelib_menuitem.o \
-       corelib_metafile.o \
-       corelib_msgdlg.o \
-       corelib_nativdlg.o \
-       corelib_nativewin.o \
-       corelib_notebook.o \
+       corelib_msw_filedlg.o \
+       corelib_msw_frame.o \
+       corelib_msw_gauge.o \
+       corelib_headerctrl.o \
+       corelib_msw_iniconf.o \
+       corelib_msw_listbox.o \
+       corelib_msw_listctrl.o \
+       corelib_msw_mdi.o \
+       corelib_msw_menu.o \
+       corelib_msw_menuitem.o \
+       corelib_msw_metafile.o \
+       corelib_msw_msgdlg.o \
+       corelib_msw_nativdlg.o \
+       corelib_msw_nativewin.o \
+       corelib_msw_notebook.o \
         corelib_access.o \
         corelib_access.o \
-       corelib_ownerdrw.o \
-       corelib_radiobox.o \
-       corelib_radiobut.o \
-       corelib_scrolbar.o \
-       corelib_slider.o \
-       corelib_spinbutt.o \
-       corelib_spinctrl.o \
-       corelib_statbmp.o \
-       corelib_statbox.o \
+       corelib_msw_ownerdrw.o \
+       corelib_panel.o \
+       corelib_progdlg.o \
+       corelib_msw_radiobox.o \
+       corelib_msw_radiobut.o \
+       corelib_richmsgdlg.o \
+       corelib_msw_scrolbar.o \
+       corelib_msw_slider.o \
+       corelib_msw_spinbutt.o \
+       corelib_msw_spinctrl.o \
+       corelib_msw_statbmp.o \
+       corelib_msw_statbox.o \
         corelib_statusbar.o \
         corelib_statusbar.o \
-       corelib_statline.o \
-       corelib_stattext.o \
-       corelib_tabctrl.o \
-       corelib_toolbar.o \
-       corelib_textctrl.o \
-       corelib_textentry.o \
-       corelib_tglbtn.o \
+       corelib_msw_statline.o \
+       corelib_msw_stattext.o \
+       corelib_msw_toolbar.o \
+       corelib_msw_textctrl.o \
+       corelib_msw_textentry.o \
+       corelib_msw_tglbtn.o \
         corelib_treectrl.o \
         corelib_dirdlgg.o \
         corelib_treectrl.o \
         corelib_dirdlgg.o \
-       corelib_fdrepdlg.o \
+       corelib_generic_fdrepdlg.o \
         corelib_filedlgg.o \
         corelib_fontdlgg.o \
         corelib_filedlgg.o \
         corelib_fontdlgg.o \
-       corelib_checklst.o \
+       corelib_wince_checklst.o \
         corelib_choicece.o \
         corelib_crt.o \
         corelib_filedlgwce.o \
         corelib_choicece.o \
         corelib_crt.o \
         corelib_filedlgwce.o \
@@ -10420,299 +11463,309 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 =  \
  @COND_TOOLKIT_COCOA@   corelib_hid.o corelib_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7 =  \
         corelib_fontmgrcmn.o \
  @COND_TOOLKIT_COCOA@   corelib_hid.o corelib_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7 =  \
         corelib_fontmgrcmn.o \
-       corelib_caret.o \
-       corelib_colour.o \
-       corelib_icon.o \
-       corelib_imaglist.o \
+       corelib_generic_caret.o \
+       corelib_generic_colour.o \
+       corelib_generic_icon.o \
+       corelib_generic_imaglist.o \
         corelib_mask.o \
         corelib_mask.o \
-       corelib_timer.o \
-       corelib_app.o \
-       corelib_bitmap.o \
-       corelib_brush.o \
-       corelib_cursor.o \
-       corelib_dc.o \
-       corelib_dcclient.o \
-       corelib_dcmemory.o \
-       corelib_dcscreen.o \
-       corelib_evtloop.o \
-       corelib_font.o \
-       corelib_fontenum.o \
-       corelib_fontmgr.o \
-       corelib_nonownedwnd.o \
-       corelib_overlay.o \
-       corelib_pen.o \
-       corelib_region.o \
-       corelib_settings.o \
-       corelib_toplevel.o \
-       corelib_utils.o \
-       corelib_window.o \
+       corelib_dfb_app.o \
+       corelib_dfb_bitmap.o \
+       corelib_dfb_brush.o \
+       corelib_dfb_cursor.o \
+       corelib_dfb_dc.o \
+       corelib_dfb_dcclient.o \
+       corelib_dfb_dcmemory.o \
+       corelib_dfb_dcscreen.o \
+       corelib_dfb_evtloop.o \
+       corelib_dfb_font.o \
+       corelib_dfb_fontenum.o \
+       corelib_dfb_fontmgr.o \
+       corelib_dfb_nonownedwnd.o \
+       corelib_dfb_overlay.o \
+       corelib_dfb_pen.o \
+       corelib_dfb_region.o \
+       corelib_dfb_settings.o \
+       corelib_dfb_toplevel.o \
+       corelib_dfb_utils.o \
+       corelib_dfb_window.o \
         corelib_wrapdfb.o
  @COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_7 =  \
         corelib_wrapdfb.o
  @COND_TOOLKIT_DFB@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_7 =  \
-       corelib_caret.o \
-       corelib_imaglist.o \
-       corelib_dialup.o \
-       corelib_fontenum.o \
-       corelib_fontutil.o \
-       corelib_utilsx11.o \
+       corelib_generic_caret.o \
+       corelib_generic_imaglist.o \
+       corelib_unix_dialup.o \
         corelib_displayx11.o \
         corelib_displayx11.o \
-       corelib_icon.o \
+       corelib_unix_fontenum.o \
+       corelib_unix_fontutil.o \
+       corelib_uiactionx11.o \
+       corelib_utilsx11.o \
+       corelib_generic_icon.o \
         corelib_paletteg.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_gsockgtk.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
+       corelib_gtk1_app.o \
+       corelib_gtk1_bitmap.o \
+       corelib_gtk1_brush.o \
+       corelib_gtk1_clipbrd.o \
+       corelib_gtk1_colour.o \
+       corelib_gtk1_cursor.o \
+       corelib_gtk1_data.o \
+       corelib_gtk1_dataobj.o \
+       corelib_gtk1_dc.o \
+       corelib_gtk1_dcclient.o \
+       corelib_gtk1_dcmemory.o \
+       corelib_gtk1_dcscreen.o \
+       corelib_gtk1_dnd.o \
+       corelib_gtk1_evtloop.o \
+       corelib_gtk1_font.o \
+       corelib_gtk1_sockgtk.o \
+       corelib_gtk1_main.o \
+       corelib_gtk1_minifram.o \
+       corelib_gtk1_pen.o \
+       corelib_gtk1_popupwin.o \
+       corelib_gtk1_region.o \
+       corelib_gtk1_renderer.o \
+       corelib_gtk1_settings.o \
+       corelib_gtk1_timer.o \
+       corelib_gtk1_tooltip.o \
+       corelib_gtk1_toplevel.o \
+       corelib_gtk1_utilsgtk.o \
+       corelib_gtk1_win_gtk.o \
+       corelib_gtk1_window.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_7)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_7 =  \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_7)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_7 =  \
-       corelib_caret.o \
-       corelib_imaglist.o \
-       corelib_dialup.o \
-       corelib_fontenum.o \
-       corelib_fontutil.o \
-       corelib_utilsx11.o \
+       corelib_generic_caret.o \
+       corelib_generic_imaglist.o \
+       corelib_unix_dialup.o \
         corelib_displayx11.o \
         corelib_displayx11.o \
-       corelib_icon.o \
+       corelib_unix_fontenum.o \
+       corelib_unix_fontutil.o \
+       corelib_uiactionx11.o \
+       corelib_utilsx11.o \
+       corelib_generic_icon.o \
         corelib_paletteg.o \
         corelib_paletteg.o \
-       corelib_app.o \
+       corelib_gtk_app.o \
         corelib_assertdlg_gtk.o \
         corelib_assertdlg_gtk.o \
-       corelib_bitmap.o \
-       corelib_brush.o \
-       corelib_clipbrd.o \
-       corelib_colour.o \
-       corelib_cursor.o \
-       corelib_dataobj.o \
-       corelib_dc.o \
-       corelib_dcclient.o \
-       corelib_dcmemory.o \
-       corelib_dcscreen.o \
-       corelib_dnd.o \
-       corelib_evtloop.o \
+       corelib_gtk_bitmap.o \
+       corelib_gtk_brush.o \
+       corelib_gtk_clipbrd.o \
+       corelib_gtk_colour.o \
+       corelib_gtk_cursor.o \
+       corelib_gtk_dataobj.o \
+       corelib_gtk_dc.o \
+       corelib_gtk_dcclient.o \
+       corelib_gtk_dcmemory.o \
+       corelib_gtk_dcscreen.o \
+       corelib_gtk_dnd.o \
+       corelib_gtk_evtloop.o \
         corelib_filectrl.o \
         corelib_filectrl.o \
-       corelib_font.o \
-       corelib_gsockgtk.o \
-       corelib_minifram.o \
-       corelib_pen.o \
-       corelib_popupwin.o \
+       corelib_filehistory.o \
+       corelib_gtk_font.o \
+       corelib_gtk_sockgtk.o \
+       corelib_gtk_minifram.o \
+       corelib_gtk_pen.o \
+       corelib_gtk_popupwin.o \
         corelib_private.o \
         corelib_private.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
+       corelib_gtk_region.o \
+       corelib_gtk_renderer.o \
+       corelib_gtk_settings.o \
+       corelib_gtk_timer.o \
+       corelib_gtk_tooltip.o \
+       corelib_gtk_toplevel.o \
+       corelib_gtk_utilsgtk.o \
+       corelib_gtk_win_gtk.o \
+       corelib_gtk_window.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_7)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_7 =  \
         corelib_fontmgrcmn.o \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_7)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_7 =  \
         corelib_fontmgrcmn.o \
-       corelib_caret.o \
-       corelib_colour.o \
-       corelib_icon.o \
-       corelib_imaglist.o \
+       corelib_generic_caret.o \
+       corelib_generic_colour.o \
+       corelib_generic_icon.o \
+       corelib_generic_imaglist.o \
         corelib_mask.o \
         corelib_mask.o \
-       corelib_timer.o \
-       corelib_app.o \
-       corelib_bitmap.o \
-       corelib_brush.o \
-       corelib_clipbrd.o \
-       corelib_cursor.o \
-       corelib_data.o \
-       corelib_dc.o \
-       corelib_dcclient.o \
-       corelib_dcmemory.o \
-       corelib_dcscreen.o \
+       corelib_generic_timer.o \
+       corelib_mgl_app.o \
+       corelib_mgl_bitmap.o \
+       corelib_mgl_brush.o \
+       corelib_mgl_clipbrd.o \
+       corelib_mgl_cursor.o \
+       corelib_mgl_data.o \
+       corelib_mgl_dc.o \
+       corelib_mgl_dcclient.o \
+       corelib_mgl_dcmemory.o \
+       corelib_mgl_dcscreen.o \
         corelib_dirmgl.o \
         corelib_dirmgl.o \
-       corelib_evtloop.o \
-       corelib_font.o \
-       corelib_fontenum.o \
-       corelib_fontmgr.o \
-       corelib_fontutil.o \
-       corelib_palette.o \
-       corelib_pen.o \
-       corelib_region.o \
-       corelib_settings.o \
-       corelib_toplevel.o \
-       corelib_utils.o \
-       corelib_window.o
+       corelib_mgl_evtloop.o \
+       corelib_mgl_font.o \
+       corelib_mgl_fontenum.o \
+       corelib_mgl_fontmgr.o \
+       corelib_mgl_fontutil.o \
+       corelib_mgl_palette.o \
+       corelib_mgl_pen.o \
+       corelib_mgl_region.o \
+       corelib_mgl_settings.o \
+       corelib_mgl_toplevel.o \
+       corelib_mgl_utils.o \
+       corelib_mgl_window.o
  @COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_7)
  COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_7 =  \
  @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_imaglist.o \
-       corelib_dialup.o \
-       corelib_fontenum.o \
-       corelib_fontutil.o \
-       corelib_utilsx11.o \
+       corelib_generic_caret.o \
+       corelib_generic_imaglist.o \
+       corelib_unix_dialup.o \
         corelib_displayx11.o \
         corelib_displayx11.o \
-       corelib_bitmap.o \
-       corelib_brush.o \
-       corelib_palette.o \
-       corelib_pen.o \
-       corelib_region.o \
+       corelib_unix_fontenum.o \
+       corelib_unix_fontutil.o \
+       corelib_uiactionx11.o \
+       corelib_utilsx11.o \
+       corelib_x11_bitmap.o \
+       corelib_x11_brush.o \
+       corelib_x11_palette.o \
+       corelib_x11_pen.o \
+       corelib_x11_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_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_activex.o \
+       corelib_msw_app.o \
+       corelib_msw_bitmap.o \
+       corelib_msw_brush.o \
+       corelib_msw_caret.o \
+       corelib_msw_clipbrd.o \
+       corelib_msw_colour.o \
+       corelib_msw_cursor.o \
+       corelib_msw_data.o \
+       corelib_msw_dc.o \
+       corelib_msw_dcclient.o \
+       corelib_msw_dcmemory.o \
+       corelib_msw_dcprint.o \
+       corelib_msw_dcscreen.o \
+       corelib_msw_dialup.o \
         corelib_dib.o \
         corelib_dib.o \
-       corelib_display.o \
+       corelib_msw_display.o \
         corelib_enhmeta.o \
         corelib_enhmeta.o \
-       corelib_font.o \
-       corelib_fontenum.o \
-       corelib_fontutil.o \
-       corelib_gdiimage.o \
-       corelib_gdiobj.o \
+       corelib_msw_font.o \
+       corelib_msw_fontenum.o \
+       corelib_msw_fontutil.o \
+       corelib_msw_gdiimage.o \
+       corelib_msw_gdiobj.o \
         corelib_gdiplus.o \
         corelib_gdiplus.o \
-       corelib_graphics.o \
-       corelib_icon.o \
-       corelib_imaglist.o \
-       corelib_minifram.o \
-       corelib_dataobj.o \
+       corelib_msw_graphics.o \
+       corelib_msw_icon.o \
+       corelib_msw_imaglist.o \
+       corelib_msw_minifram.o \
+       corelib_ole_dataobj.o \
         corelib_dropsrc.o \
         corelib_droptgt.o \
         corelib_oleutils.o \
         corelib_dropsrc.o \
         corelib_droptgt.o \
         corelib_oleutils.o \
-       corelib_palette.o \
-       corelib_pen.o \
-       corelib_popupwin.o \
-       corelib_printdlg.o \
+       corelib_msw_palette.o \
+       corelib_msw_pen.o \
+       corelib_msw_popupwin.o \
+       corelib_msw_printdlg.o \
         corelib_printwin.o \
         corelib_printwin.o \
-       corelib_region.o \
-       corelib_renderer.o \
-       corelib_settings.o \
-       corelib_tooltip.o \
-       corelib_toplevel.o \
-       corelib_utilsgui.o \
+       corelib_msw_region.o \
+       corelib_msw_renderer.o \
+       corelib_msw_settings.o \
+       corelib_msw_tooltip.o \
+       corelib_msw_toplevel.o \
+       corelib_uiaction.o \
+       corelib_msw_utilsgui.o \
         corelib_uxtheme.o \
         corelib_uxtheme.o \
-       corelib_window.o \
+       corelib_msw_window.o \
         corelib_helpchm.o \
         corelib_helpchm.o \
-       corelib_helpwin.o \
+       corelib_msw_helpwin.o \
         corelib_automtn.o \
         corelib_uuid.o
  @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7)
  @COND_TOOLKIT_OSX_CARBON@__LOWLEVEL_SRC_OBJECTS_7 \
         corelib_automtn.o \
         corelib_uuid.o
  @COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7)
  @COND_TOOLKIT_OSX_CARBON@__LOWLEVEL_SRC_OBJECTS_7 \
-@COND_TOOLKIT_OSX_CARBON@      = $(__OSX_LOWLEVEL_SRC_OBJECTS_1_4)
+@COND_TOOLKIT_OSX_CARBON@      = $(__OSX_LOWLEVEL_SRC_OBJECTS_2_2)
  @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \
  @COND_TOOLKIT_OSX_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \
-@COND_TOOLKIT_OSX_COCOA@       $(__OSX_LOWLEVEL_SRC_OBJECTS_1_4)
+@COND_TOOLKIT_OSX_COCOA@       $(__OSX_LOWLEVEL_SRC_OBJECTS_2_2)
+@COND_TOOLKIT_OSX_IPHONE@__LOWLEVEL_SRC_OBJECTS_7 \
+@COND_TOOLKIT_OSX_IPHONE@      = $(__OSX_LOWLEVEL_SRC_OBJECTS_2_2)
  @COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_7 = 
  COND_TOOLKIT_WINCE___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_activex.o \
+       corelib_msw_app.o \
+       corelib_msw_bitmap.o \
+       corelib_msw_brush.o \
+       corelib_msw_caret.o \
+       corelib_msw_clipbrd.o \
+       corelib_msw_colour.o \
+       corelib_msw_cursor.o \
+       corelib_msw_data.o \
+       corelib_msw_dc.o \
+       corelib_msw_dcclient.o \
+       corelib_msw_dcmemory.o \
+       corelib_msw_dcprint.o \
+       corelib_msw_dcscreen.o \
+       corelib_msw_dialup.o \
         corelib_dib.o \
         corelib_dib.o \
-       corelib_display.o \
+       corelib_msw_display.o \
         corelib_enhmeta.o \
         corelib_enhmeta.o \
-       corelib_font.o \
-       corelib_fontenum.o \
-       corelib_fontutil.o \
-       corelib_gdiimage.o \
-       corelib_gdiobj.o \
+       corelib_msw_font.o \
+       corelib_msw_fontenum.o \
+       corelib_msw_fontutil.o \
+       corelib_msw_gdiimage.o \
+       corelib_msw_gdiobj.o \
         corelib_gdiplus.o \
         corelib_gdiplus.o \
-       corelib_graphics.o \
-       corelib_icon.o \
-       corelib_imaglist.o \
-       corelib_minifram.o \
-       corelib_dataobj.o \
+       corelib_msw_graphics.o \
+       corelib_msw_icon.o \
+       corelib_msw_imaglist.o \
+       corelib_msw_minifram.o \
+       corelib_ole_dataobj.o \
         corelib_dropsrc.o \
         corelib_droptgt.o \
         corelib_oleutils.o \
         corelib_dropsrc.o \
         corelib_droptgt.o \
         corelib_oleutils.o \
-       corelib_palette.o \
-       corelib_pen.o \
-       corelib_popupwin.o \
-       corelib_printdlg.o \
+       corelib_msw_palette.o \
+       corelib_msw_pen.o \
+       corelib_msw_popupwin.o \
+       corelib_msw_printdlg.o \
         corelib_printwin.o \
         corelib_printwin.o \
-       corelib_region.o \
-       corelib_renderer.o \
-       corelib_settings.o \
-       corelib_tooltip.o \
-       corelib_toplevel.o \
-       corelib_utilsgui.o \
+       corelib_msw_region.o \
+       corelib_msw_renderer.o \
+       corelib_msw_settings.o \
+       corelib_msw_tooltip.o \
+       corelib_msw_toplevel.o \
+       corelib_uiaction.o \
+       corelib_msw_utilsgui.o \
         corelib_uxtheme.o \
         corelib_uxtheme.o \
-       corelib_window.o
+       corelib_msw_window.o
  @COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_7)
  COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7 =  \
  @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_imaglist.o \
-       corelib_dialup.o \
-       corelib_fontenum.o \
-       corelib_fontutil.o \
-       corelib_utilsx11.o \
+       corelib_generic_caret.o \
+       corelib_generic_imaglist.o \
+       corelib_unix_dialup.o \
         corelib_displayx11.o \
         corelib_displayx11.o \
-       corelib_icon.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_minifram.o \
+       corelib_unix_fontenum.o \
+       corelib_unix_fontutil.o \
+       corelib_uiactionx11.o \
+       corelib_utilsx11.o \
+       corelib_generic_icon.o \
+       corelib_generic_timer.o \
+       corelib_x11_app.o \
+       corelib_x11_bitmap.o \
+       corelib_x11_brush.o \
+       corelib_x11_clipbrd.o \
+       corelib_x11_colour.o \
+       corelib_x11_cursor.o \
+       corelib_x11_data.o \
+       corelib_x11_dataobj.o \
+       corelib_x11_dc.o \
+       corelib_x11_dcclient.o \
+       corelib_x11_dcmemory.o \
+       corelib_x11_dcscreen.o \
+       corelib_x11_evtloop.o \
+       corelib_x11_font.o \
+       corelib_x11_minifram.o \
         corelib_nanox.o \
         corelib_nanox.o \
-       corelib_palette.o \
-       corelib_pen.o \
-       corelib_popupwin.o \
-       corelib_region.o \
+       corelib_x11_palette.o \
+       corelib_x11_pen.o \
+       corelib_x11_popupwin.o \
+       corelib_x11_region.o \
         corelib_reparent.o \
         corelib_reparent.o \
-       corelib_settings.o \
-       corelib_toplevel.o \
-       corelib_utils.o \
+       corelib_x11_settings.o \
+       corelib_x11_toplevel.o \
+       corelib_x11_utils.o \
         corelib_utilsx.o \
         corelib_utilsx.o \
-       corelib_window.o
+       corelib_x11_window.o
  @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7)
  @COND_SHARED_1@____wxcore_namedll_DEP = $(__coredll___depname)
  @COND_SHARED_0@____wxcore_namelib_DEP = $(__corelib___depname)
  @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7)
  @COND_SHARED_1@____wxcore_namedll_DEP = $(__coredll___depname)
  @COND_SHARED_0@____wxcore_namelib_DEP = $(__corelib___depname)
@@ -10732,18 +11785,18 @@ COND_PLATFORM_OS2_1___advdll___importlib = -import \
  COND_WINDOWS_IMPLIB_1___advdll___importlib = \
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__advdll___importlib = $(COND_WINDOWS_IMPLIB_1___advdll___importlib)
  COND_WINDOWS_IMPLIB_1___advdll___importlib = \
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__advdll___importlib = $(COND_WINDOWS_IMPLIB_1___advdll___importlib)
-@COND_GCC_PCH_1@__advdll_PCH_INC = -I.pch/wxprec_advdll
-@COND_ICC_PCH_1@__advdll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_advdll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_advdll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_advdll/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__advdll_PCH_INC = -I./.pch/wxprec_advdll
+@COND_ICC_PCH_1@__advdll_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_advdll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_advdll_wx_wxprec_h_gch___depname \
+@COND_USE_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_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 \
+COND_USE_SOTWOSYMLINKS_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) \
         $(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) \
@@ -10752,8 +11805,14 @@ COND_USE_SOSYMLINKS_1___advdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
         $(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))
         $(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 \
+@COND_USE_SOTWOSYMLINKS_1@__advdll___so_symlinks_cmd = $(COND_USE_SOTWOSYMLINKS_1___advdll___so_symlinks_cmd)
+COND_USE_SOVERSOLARIS_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); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOVERSOLARIS_1@__advdll___so_symlinks_cmd = $(COND_USE_SOVERSOLARIS_1___advdll___so_symlinks_cmd)
+COND_USE_SOTWOSYMLINKS_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) \
         $(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) \
@@ -10762,26 +11821,40 @@ COND_USE_SOSYMLINKS_1___advdll___so_symlinks_inst_cmd = rm -f \
         $(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)
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__advdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___advdll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___advdll___so_symlinks_uninst_cmd = rm -f \
+@COND_USE_SOTWOSYMLINKS_1@__advdll___so_symlinks_inst_cmd = $(COND_USE_SOTWOSYMLINKS_1___advdll___so_symlinks_inst_cmd)
+COND_USE_SOVERSOLARIS_1___advdll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX);
+@COND_USE_SOVERSOLARIS_1@__advdll___so_symlinks_inst_cmd = $(COND_USE_SOVERSOLARIS_1___advdll___so_symlinks_inst_cmd)
+COND_USE_SOTWOSYMLINKS_1___advdll___so_symlinks_uninst_cmd = rm -f \
         $(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)
         $(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_uninst_cmd = $(COND_USE_SOSYMLINKS_1___advdll___so_symlinks_uninst_cmd)
+@COND_USE_SOTWOSYMLINKS_1@__advdll___so_symlinks_uninst_cmd = $(COND_USE_SOTWOSYMLINKS_1___advdll___so_symlinks_uninst_cmd)
+COND_USE_SOVERSOLARIS_1___advdll___so_symlinks_uninst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOVERSOLARIS_1@__advdll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___advdll___so_symlinks_uninst_cmd)
  @COND_PLATFORM_WIN32_1@__advdll___win32rc = advdll_version_rc.o
  COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_2 =  \
         advdll_animatecmn.o \
         advdll_bmpcboxcmn.o \
         advdll_calctrlcmn.o \
         advdll_datavcmn.o \
  @COND_PLATFORM_WIN32_1@__advdll___win32rc = advdll_version_rc.o
  COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_2 =  \
         advdll_animatecmn.o \
         advdll_bmpcboxcmn.o \
         advdll_calctrlcmn.o \
         advdll_datavcmn.o \
+       advdll_gridcmn.o \
         advdll_hyperlnkcmn.o \
         advdll_hyperlnkcmn.o \
+       advdll_odcombocmn.o \
         advdll_aboutdlgg.o \
         advdll_aboutdlgg.o \
+       advdll_bannerwindow.o \
         advdll_bmpcboxg.o \
         advdll_calctrlg.o \
         advdll_bmpcboxg.o \
         advdll_calctrlg.o \
+       advdll_commandlinkbuttong.o \
         advdll_datavgen.o \
         advdll_datectlg.o \
         advdll_editlbox.o \
         advdll_grid.o \
         advdll_gridctrl.o \
         advdll_datavgen.o \
         advdll_datectlg.o \
         advdll_editlbox.o \
         advdll_grid.o \
         advdll_gridctrl.o \
+       advdll_grideditors.o \
         advdll_gridsel.o \
         advdll_helpext.o \
         advdll_hyperlinkg.o \
         advdll_gridsel.o \
         advdll_helpext.o \
         advdll_hyperlinkg.o \
@@ -10792,6 +11865,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_2 =  \
         advdll_sashwin.o \
         advdll_splash.o \
         advdll_tipdlg.o \
         advdll_sashwin.o \
         advdll_splash.o \
         advdll_tipdlg.o \
+       advdll_treelist.o \
         advdll_wizard.o \
         $(__ADVANCED_PLATFORM_SRC_OBJECTS_8) \
         $(__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2)
         advdll_wizard.o \
         $(__ADVANCED_PLATFORM_SRC_OBJECTS_8) \
         $(__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2)
@@ -10801,15 +11875,20 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_2 =  \
         advdll_bmpcboxcmn.o \
         advdll_calctrlcmn.o \
         advdll_datavcmn.o \
         advdll_bmpcboxcmn.o \
         advdll_calctrlcmn.o \
         advdll_datavcmn.o \
+       advdll_gridcmn.o \
         advdll_hyperlnkcmn.o \
         advdll_hyperlnkcmn.o \
+       advdll_odcombocmn.o \
         advdll_aboutdlgg.o \
         advdll_aboutdlgg.o \
+       advdll_bannerwindow.o \
         advdll_bmpcboxg.o \
         advdll_calctrlg.o \
         advdll_bmpcboxg.o \
         advdll_calctrlg.o \
+       advdll_commandlinkbuttong.o \
         advdll_datavgen.o \
         advdll_datectlg.o \
         advdll_editlbox.o \
         advdll_grid.o \
         advdll_gridctrl.o \
         advdll_datavgen.o \
         advdll_datectlg.o \
         advdll_editlbox.o \
         advdll_grid.o \
         advdll_gridctrl.o \
+       advdll_grideditors.o \
         advdll_gridsel.o \
         advdll_helpext.o \
         advdll_hyperlinkg.o \
         advdll_gridsel.o \
         advdll_helpext.o \
         advdll_hyperlinkg.o \
@@ -10820,24 +11899,37 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_2 =  \
         advdll_sashwin.o \
         advdll_splash.o \
         advdll_tipdlg.o \
         advdll_sashwin.o \
         advdll_splash.o \
         advdll_tipdlg.o \
+       advdll_treelist.o \
         advdll_wizard.o \
         $(__ADVANCED_PLATFORM_SRC_OBJECTS_8) \
         advdll_animateg.o
  @COND_WXUNIV_1@__ADVANCED_SRC_OBJECTS_2 = $(COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_2)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 =  \
         advdll_wizard.o \
         $(__ADVANCED_PLATFORM_SRC_OBJECTS_8) \
         advdll_animateg.o
  @COND_WXUNIV_1@__ADVANCED_SRC_OBJECTS_2 = $(COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_2)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 =  \
-       advdll_aboutdlg.o \
+       advdll_gtk_aboutdlg.o \
         advdll_animate.o \
         advdll_animate.o \
-       advdll_bmpcbox.o \
-       advdll_calctrl.o \
-       advdll_dataview.o \
-       advdll_hyperlink.o
+       advdll_gtk_bmpcbox.o \
+       advdll_gtk_calctrl.o \
+       advdll_gtk_dataview.o \
+       advdll_gtk_hyperlink.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2)
-@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 \
-@COND_TOOLKIT_MSW@     = advdll_bmpcbox.o advdll_calctrl.o advdll_datecontrols.o \
-@COND_TOOLKIT_MSW@     advdll_datectrl.o
-@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 \
-@COND_TOOLKIT_WINCE@   = advdll_bmpcbox.o advdll_calctrl.o \
-@COND_TOOLKIT_WINCE@   advdll_datecontrols.o advdll_datectrl.o
+COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 =  \
+       advdll_animateg.o \
+       advdll_msw_bmpcbox.o \
+       advdll_msw_calctrl.o \
+       advdll_commandlinkbutton.o \
+       advdll_datecontrols.o \
+       advdll_datectrl.o \
+       advdll_msw_hyperlink.o
+@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2)
+COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 =  \
+       advdll_animateg.o \
+       advdll_msw_bmpcbox.o \
+       advdll_msw_calctrl.o \
+       advdll_commandlinkbutton.o \
+       advdll_datecontrols.o \
+       advdll_datectrl.o \
+       advdll_msw_hyperlink.o
+@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2)
  @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_2 \
  @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@   = advdll_sound_sdl.o
  COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \
  @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_2 \
  @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@   = advdll_sound_sdl.o
  COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \
@@ -10847,25 +11939,30 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = install_advlib
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__uninstall_advlib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = uninstall_advlib
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = install_advlib
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__uninstall_advlib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = uninstall_advlib
-@COND_GCC_PCH_1@__advlib_PCH_INC = -I.pch/wxprec_advlib
-@COND_ICC_PCH_1@__advlib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_advlib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_advlib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_advlib/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__advlib_PCH_INC = -I./.pch/wxprec_advlib
+@COND_ICC_PCH_1@__advlib_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_advlib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_advlib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_advlib/wx/wxprec.h.gch
  COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_3 =  \
         advlib_animatecmn.o \
         advlib_bmpcboxcmn.o \
         advlib_calctrlcmn.o \
         advlib_datavcmn.o \
  COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_3 =  \
         advlib_animatecmn.o \
         advlib_bmpcboxcmn.o \
         advlib_calctrlcmn.o \
         advlib_datavcmn.o \
+       advlib_gridcmn.o \
         advlib_hyperlnkcmn.o \
         advlib_hyperlnkcmn.o \
+       advlib_odcombocmn.o \
         advlib_aboutdlgg.o \
         advlib_aboutdlgg.o \
+       advlib_bannerwindow.o \
         advlib_bmpcboxg.o \
         advlib_calctrlg.o \
         advlib_bmpcboxg.o \
         advlib_calctrlg.o \
+       advlib_commandlinkbuttong.o \
         advlib_datavgen.o \
         advlib_datectlg.o \
         advlib_editlbox.o \
         advlib_grid.o \
         advlib_gridctrl.o \
         advlib_datavgen.o \
         advlib_datectlg.o \
         advlib_editlbox.o \
         advlib_grid.o \
         advlib_gridctrl.o \
+       advlib_grideditors.o \
         advlib_gridsel.o \
         advlib_helpext.o \
         advlib_hyperlinkg.o \
         advlib_gridsel.o \
         advlib_helpext.o \
         advlib_hyperlinkg.o \
@@ -10876,6 +11973,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_3 =  \
         advlib_sashwin.o \
         advlib_splash.o \
         advlib_tipdlg.o \
         advlib_sashwin.o \
         advlib_splash.o \
         advlib_tipdlg.o \
+       advlib_treelist.o \
         advlib_wizard.o \
         $(__ADVANCED_PLATFORM_SRC_OBJECTS_9) \
         $(__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3)
         advlib_wizard.o \
         $(__ADVANCED_PLATFORM_SRC_OBJECTS_9) \
         $(__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3)
@@ -10885,15 +11983,20 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3 =  \
         advlib_bmpcboxcmn.o \
         advlib_calctrlcmn.o \
         advlib_datavcmn.o \
         advlib_bmpcboxcmn.o \
         advlib_calctrlcmn.o \
         advlib_datavcmn.o \
+       advlib_gridcmn.o \
         advlib_hyperlnkcmn.o \
         advlib_hyperlnkcmn.o \
+       advlib_odcombocmn.o \
         advlib_aboutdlgg.o \
         advlib_aboutdlgg.o \
+       advlib_bannerwindow.o \
         advlib_bmpcboxg.o \
         advlib_calctrlg.o \
         advlib_bmpcboxg.o \
         advlib_calctrlg.o \
+       advlib_commandlinkbuttong.o \
         advlib_datavgen.o \
         advlib_datectlg.o \
         advlib_editlbox.o \
         advlib_grid.o \
         advlib_gridctrl.o \
         advlib_datavgen.o \
         advlib_datectlg.o \
         advlib_editlbox.o \
         advlib_grid.o \
         advlib_gridctrl.o \
+       advlib_grideditors.o \
         advlib_gridsel.o \
         advlib_helpext.o \
         advlib_hyperlinkg.o \
         advlib_gridsel.o \
         advlib_helpext.o \
         advlib_hyperlinkg.o \
@@ -10904,24 +12007,37 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3 =  \
         advlib_sashwin.o \
         advlib_splash.o \
         advlib_tipdlg.o \
         advlib_sashwin.o \
         advlib_splash.o \
         advlib_tipdlg.o \
+       advlib_treelist.o \
         advlib_wizard.o \
         $(__ADVANCED_PLATFORM_SRC_OBJECTS_9) \
         advlib_animateg.o
  @COND_WXUNIV_1@__ADVANCED_SRC_OBJECTS_3 = $(COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 =  \
         advlib_wizard.o \
         $(__ADVANCED_PLATFORM_SRC_OBJECTS_9) \
         advlib_animateg.o
  @COND_WXUNIV_1@__ADVANCED_SRC_OBJECTS_3 = $(COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 =  \
-       advlib_aboutdlg.o \
+       advlib_gtk_aboutdlg.o \
         advlib_animate.o \
         advlib_animate.o \
-       advlib_bmpcbox.o \
-       advlib_calctrl.o \
-       advlib_dataview.o \
-       advlib_hyperlink.o
+       advlib_gtk_bmpcbox.o \
+       advlib_gtk_calctrl.o \
+       advlib_gtk_dataview.o \
+       advlib_gtk_hyperlink.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3)
-@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 \
-@COND_TOOLKIT_MSW@     = advlib_bmpcbox.o advlib_calctrl.o advlib_datecontrols.o \
-@COND_TOOLKIT_MSW@     advlib_datectrl.o
-@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 \
-@COND_TOOLKIT_WINCE@   = advlib_bmpcbox.o advlib_calctrl.o \
-@COND_TOOLKIT_WINCE@   advlib_datecontrols.o advlib_datectrl.o
+COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 =  \
+       advlib_animateg.o \
+       advlib_msw_bmpcbox.o \
+       advlib_msw_calctrl.o \
+       advlib_commandlinkbutton.o \
+       advlib_datecontrols.o \
+       advlib_datectrl.o \
+       advlib_msw_hyperlink.o
+@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3)
+COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 =  \
+       advlib_animateg.o \
+       advlib_msw_bmpcbox.o \
+       advlib_msw_calctrl.o \
+       advlib_commandlinkbutton.o \
+       advlib_datecontrols.o \
+       advlib_datectrl.o \
+       advlib_msw_hyperlink.o
+@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3)
  @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_3 \
  @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@   = advlib_sound_sdl.o
  @COND_SHARED_1@____wxadv_namedll_DEP = $(__advdll___depname)
  @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_3 \
  @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@   = advlib_sound_sdl.o
  @COND_SHARED_1@____wxadv_namedll_DEP = $(__advdll___depname)
@@ -10942,18 +12058,19 @@ COND_PLATFORM_OS2_1___mediadll___importlib = -import \
  COND_WINDOWS_IMPLIB_1___mediadll___importlib = \
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__mediadll___importlib = $(COND_WINDOWS_IMPLIB_1___mediadll___importlib)
  COND_WINDOWS_IMPLIB_1___mediadll___importlib = \
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__mediadll___importlib = $(COND_WINDOWS_IMPLIB_1___mediadll___importlib)
-@COND_GCC_PCH_1@__mediadll_PCH_INC = -I.pch/wxprec_mediadll
-@COND_ICC_PCH_1@__mediadll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_mediadll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_mediadll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_mediadll/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__mediadll_PCH_INC = -I./.pch/wxprec_mediadll
+@COND_ICC_PCH_1@__mediadll_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_mediadll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_mediadll_wx_wxprec_h_gch___depname \
+@COND_USE_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_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 \
+COND_USE_SOTWOSYMLINKS_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) \
         $(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) \
@@ -10962,8 +12079,15 @@ COND_USE_SOSYMLINKS_1___mediadll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
         $(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))
         $(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 \
+@COND_USE_SOTWOSYMLINKS_1@__mediadll___so_symlinks_cmd = $(COND_USE_SOTWOSYMLINKS_1___mediadll___so_symlinks_cmd)
+COND_USE_SOVERSOLARIS_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); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOVERSOLARIS_1@__mediadll___so_symlinks_cmd = $(COND_USE_SOVERSOLARIS_1___mediadll___so_symlinks_cmd)
+COND_USE_SOTWOSYMLINKS_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) \
         $(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) \
@@ -10972,31 +12096,42 @@ COND_USE_SOSYMLINKS_1___mediadll___so_symlinks_inst_cmd = rm -f \
         $(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)
         $(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_USE_SOSYMLINKS_1___mediadll___so_symlinks_uninst_cmd = rm -f \
+@COND_USE_SOTWOSYMLINKS_1@__mediadll___so_symlinks_inst_cmd = $(COND_USE_SOTWOSYMLINKS_1___mediadll___so_symlinks_inst_cmd)
+COND_USE_SOVERSOLARIS_1___mediadll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX);
+@COND_USE_SOVERSOLARIS_1@__mediadll___so_symlinks_inst_cmd = $(COND_USE_SOVERSOLARIS_1___mediadll___so_symlinks_inst_cmd)
+COND_USE_SOTWOSYMLINKS_1___mediadll___so_symlinks_uninst_cmd = rm -f \
         $(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)
         $(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_uninst_cmd = $(COND_USE_SOSYMLINKS_1___mediadll___so_symlinks_uninst_cmd)
+@COND_USE_SOTWOSYMLINKS_1@__mediadll___so_symlinks_uninst_cmd = $(COND_USE_SOTWOSYMLINKS_1___mediadll___so_symlinks_uninst_cmd)
+COND_USE_SOVERSOLARIS_1___mediadll___so_symlinks_uninst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOVERSOLARIS_1@__mediadll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___mediadll___so_symlinks_uninst_cmd)
  @COND_PLATFORM_WIN32_1@__mediadll___win32rc = mediadll_version_rc.o
  @COND_PLATFORM_WIN32_1@__mediadll___win32rc = mediadll_version_rc.o
-@COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_2 = mediadll_mediactrl.o
-@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_2 = mediadll_mediactrl.o 
-@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_2 = mediadll_mediactrl.o
+@COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_2 = \
+@COND_TOOLKIT_COCOA@   mediadll_cocoa_mediactrl.o
+@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_2 = \
+@COND_TOOLKIT_GTK@     mediadll_unix_mediactrl.o
+@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_2 = \
+@COND_TOOLKIT_MOTIF@   mediadll_unix_mediactrl.o
  COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_2 =  \
         mediadll_mediactrl_am.o \
         mediadll_mediactrl_wmp10.o \
  COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_2 =  \
         mediadll_mediactrl_am.o \
         mediadll_mediactrl_wmp10.o \
-       mediadll_mediactrl_qt.o \
-       mediadll_activex.o
+       mediadll_mediactrl_qt.o
  @COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_2)
  @COND_TOOLKIT_OSX_CARBON@__MEDIA_PLATFORM_SRC_OBJECTS_2 \
  @COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_2)
  @COND_TOOLKIT_OSX_CARBON@__MEDIA_PLATFORM_SRC_OBJECTS_2 \
-@COND_TOOLKIT_OSX_CARBON@      = mediadll_mediactrl.o
+@COND_TOOLKIT_OSX_CARBON@      = mediadll_carbon_mediactrl.o
+@COND_TOOLKIT_OSX_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_2 = 
+@COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS_2 = 
  @COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS_2 = 
  @COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS_2 = 
-COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_2 =  \
-       mediadll_mediactrl_am.o \
-       mediadll_mediactrl_wmp10.o \
-       mediadll_mediactrl_qt.o \
-       mediadll_activex.o
-@COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_2 = $(COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_2)
-@COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_2 = mediadll_mediactrl.o
+@COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_2 = \
+@COND_TOOLKIT_WINCE@   mediadll_mediactrl_am.o mediadll_mediactrl_wmp10.o \
+@COND_TOOLKIT_WINCE@   mediadll_mediactrl_qt.o
+@COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_2 = \
+@COND_TOOLKIT_X11@     mediadll_unix_mediactrl.o
  COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_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_USE_MEDIA_1@__medialib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1___medialib___depname)
  COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_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_USE_MEDIA_1@__medialib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1___medialib___depname)
@@ -11004,30 +12139,32 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1___medialib___depname = \
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@     = install_medialib
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@__uninstall_medialib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@     = uninstall_medialib
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@     = install_medialib
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@__uninstall_medialib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@     = uninstall_medialib
-@COND_GCC_PCH_1@__medialib_PCH_INC = -I.pch/wxprec_medialib
-@COND_ICC_PCH_1@__medialib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_medialib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_medialib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_medialib/wx/wxprec.h.gch
-@COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_3 = medialib_mediactrl.o
-@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_3 = medialib_mediactrl.o 
-@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_3 = medialib_mediactrl.o
+@COND_GCC_PCH_1@__medialib_PCH_INC = -I./.pch/wxprec_medialib
+@COND_ICC_PCH_1@__medialib_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_medialib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_medialib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_medialib/wx/wxprec.h.gch
+@COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_3 = \
+@COND_TOOLKIT_COCOA@   medialib_cocoa_mediactrl.o
+@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_3 = \
+@COND_TOOLKIT_GTK@     medialib_unix_mediactrl.o
+@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_3 = \
+@COND_TOOLKIT_MOTIF@   medialib_unix_mediactrl.o
  COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_3 =  \
         medialib_mediactrl_am.o \
         medialib_mediactrl_wmp10.o \
  COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_3 =  \
         medialib_mediactrl_am.o \
         medialib_mediactrl_wmp10.o \
-       medialib_mediactrl_qt.o \
-       medialib_activex.o
+       medialib_mediactrl_qt.o
  @COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_3)
  @COND_TOOLKIT_OSX_CARBON@__MEDIA_PLATFORM_SRC_OBJECTS_3 \
  @COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_3)
  @COND_TOOLKIT_OSX_CARBON@__MEDIA_PLATFORM_SRC_OBJECTS_3 \
-@COND_TOOLKIT_OSX_CARBON@      = medialib_mediactrl.o
+@COND_TOOLKIT_OSX_CARBON@      = medialib_carbon_mediactrl.o
+@COND_TOOLKIT_OSX_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_3 = 
+@COND_TOOLKIT_OSX_IPHONE@__MEDIA_PLATFORM_SRC_OBJECTS_3 = 
  @COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS_3 = 
  @COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS_3 = 
-COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_3 =  \
-       medialib_mediactrl_am.o \
-       medialib_mediactrl_wmp10.o \
-       medialib_mediactrl_qt.o \
-       medialib_activex.o
-@COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_3 = $(COND_TOOLKIT_WINCE___MEDIA_PLATFORM_SRC_OBJECTS_3)
-@COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_3 = medialib_mediactrl.o
+@COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_3 = \
+@COND_TOOLKIT_WINCE@   medialib_mediactrl_am.o medialib_mediactrl_wmp10.o \
+@COND_TOOLKIT_WINCE@   medialib_mediactrl_qt.o
+@COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_3 = \
+@COND_TOOLKIT_X11@     medialib_unix_mediactrl.o
  @COND_SHARED_1@____wxmedia_namedll_DEP = $(__mediadll___depname)
  @COND_SHARED_0@____wxmedia_namelib_DEP = $(__medialib___depname)
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll___depname = \
  @COND_SHARED_1@____wxmedia_namedll_DEP = $(__mediadll___depname)
  @COND_SHARED_0@____wxmedia_namelib_DEP = $(__medialib___depname)
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll___depname = \
@@ -11046,18 +12183,19 @@ COND_PLATFORM_OS2_1___htmldll___importlib = -import \
  COND_WINDOWS_IMPLIB_1___htmldll___importlib = \
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__htmldll___importlib = $(COND_WINDOWS_IMPLIB_1___htmldll___importlib)
  COND_WINDOWS_IMPLIB_1___htmldll___importlib = \
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__htmldll___importlib = $(COND_WINDOWS_IMPLIB_1___htmldll___importlib)
-@COND_GCC_PCH_1@__htmldll_PCH_INC = -I.pch/wxprec_htmldll
-@COND_ICC_PCH_1@__htmldll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_htmldll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_htmldll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_htmldll/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__htmldll_PCH_INC = -I./.pch/wxprec_htmldll
+@COND_ICC_PCH_1@__htmldll_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_htmldll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_htmldll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_htmldll/wx/wxprec.h.gch
  COND_USE_SOVERLINUX_1___htmldll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_USE_SOVERLINUX_1@__htmldll___soname_flags = $(COND_USE_SOVERLINUX_1___htmldll___soname_flags)
  COND_USE_SOVERSOLARIS_1___htmldll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_USE_SOVERSOLARIS_1@__htmldll___soname_flags = $(COND_USE_SOVERSOLARIS_1___htmldll___soname_flags)
  COND_USE_SOVERLINUX_1___htmldll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_USE_SOVERLINUX_1@__htmldll___soname_flags = $(COND_USE_SOVERLINUX_1___htmldll___soname_flags)
  COND_USE_SOVERSOLARIS_1___htmldll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_USE_SOVERSOLARIS_1@__htmldll___soname_flags = $(COND_USE_SOVERSOLARIS_1___htmldll___soname_flags)
-COND_USE_SOSYMLINKS_1___htmldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+COND_USE_SOTWOSYMLINKS_1___htmldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm \
+       -f \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
@@ -11066,8 +12204,14 @@ COND_USE_SOSYMLINKS_1___htmldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__htmldll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___htmldll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___htmldll___so_symlinks_inst_cmd = rm -f \
+@COND_USE_SOTWOSYMLINKS_1@__htmldll___so_symlinks_cmd = $(COND_USE_SOTWOSYMLINKS_1___htmldll___so_symlinks_cmd)
+COND_USE_SOVERSOLARIS_1___htmldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOVERSOLARIS_1@__htmldll___so_symlinks_cmd = $(COND_USE_SOVERSOLARIS_1___htmldll___so_symlinks_cmd)
+COND_USE_SOTWOSYMLINKS_1___htmldll___so_symlinks_inst_cmd = rm -f \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
@@ -11076,11 +12220,20 @@ COND_USE_SOSYMLINKS_1___htmldll___so_symlinks_inst_cmd = rm -f \
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__htmldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___htmldll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___htmldll___so_symlinks_uninst_cmd = rm -f \
+@COND_USE_SOTWOSYMLINKS_1@__htmldll___so_symlinks_inst_cmd = $(COND_USE_SOTWOSYMLINKS_1___htmldll___so_symlinks_inst_cmd)
+COND_USE_SOVERSOLARIS_1___htmldll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX);
+@COND_USE_SOVERSOLARIS_1@__htmldll___so_symlinks_inst_cmd = $(COND_USE_SOVERSOLARIS_1___htmldll___so_symlinks_inst_cmd)
+COND_USE_SOTWOSYMLINKS_1___htmldll___so_symlinks_uninst_cmd = rm -f \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__htmldll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___htmldll___so_symlinks_uninst_cmd)
+@COND_USE_SOTWOSYMLINKS_1@__htmldll___so_symlinks_uninst_cmd = $(COND_USE_SOTWOSYMLINKS_1___htmldll___so_symlinks_uninst_cmd)
+COND_USE_SOVERSOLARIS_1___htmldll___so_symlinks_uninst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOVERSOLARIS_1@__htmldll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___htmldll___so_symlinks_uninst_cmd)
  @COND_PLATFORM_WIN32_1@__htmldll___win32rc = htmldll_version_rc.o
  @COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS_2 = htmldll_chm.o
  @COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_2 = htmldll_chm.o
  @COND_PLATFORM_WIN32_1@__htmldll___win32rc = htmldll_version_rc.o
  @COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS_2 = htmldll_chm.o
  @COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_2 = htmldll_chm.o
@@ -11092,16 +12245,113 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1___htmllib___depname = \
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@      = install_htmllib
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@__uninstall_htmllib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@      = uninstall_htmllib
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@      = install_htmllib
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@__uninstall_htmllib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@      = uninstall_htmllib
-@COND_GCC_PCH_1@__htmllib_PCH_INC = -I.pch/wxprec_htmllib
-@COND_ICC_PCH_1@__htmllib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_htmllib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_htmllib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_htmllib/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__htmllib_PCH_INC = -I./.pch/wxprec_htmllib
+@COND_ICC_PCH_1@__htmllib_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_htmllib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_htmllib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_htmllib/wx/wxprec.h.gch
  @COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_chm.o
  @COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_chm.o
  @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_helpbest.o
  @COND_SHARED_1@____wxhtml_namedll_DEP = $(__htmldll___depname)
  @COND_SHARED_0@____wxhtml_namelib_DEP = $(__htmllib___depname)
  @COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_chm.o
  @COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_chm.o
  @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_3 = htmllib_helpbest.o
  @COND_SHARED_1@____wxhtml_namedll_DEP = $(__htmldll___depname)
  @COND_SHARED_0@____wxhtml_namelib_DEP = $(__htmllib___depname)
+COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1___webviewdll___depname = \
+       $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@__webviewdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1___webviewdll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@__install_webviewdll___depname \
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@   = install_webviewdll
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@__uninstall_webviewdll___depname \
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@   = \
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@   uninstall_webviewdll
+COND_PLATFORM_MACOSX_1___webviewdll___macinstnamecmd = -install_name \
+       $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_PLATFORM_MACOSX_1@__webviewdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___webviewdll___macinstnamecmd)
+COND_PLATFORM_OS2_1___webviewdll___importlib = -import \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_PLATFORM_OS2_1@__webviewdll___importlib = $(COND_PLATFORM_OS2_1___webviewdll___importlib)
+COND_WINDOWS_IMPLIB_1___webviewdll___importlib = \
+       -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_WINDOWS_IMPLIB_1@__webviewdll___importlib = $(COND_WINDOWS_IMPLIB_1___webviewdll___importlib)
+@COND_GCC_PCH_1@__webviewdll_PCH_INC = -I./.pch/wxprec_webviewdll
+@COND_ICC_PCH_1@__webviewdll_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_webviewdll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_webviewdll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_webviewdll/wx/wxprec.h.gch
+COND_USE_SOVERLINUX_1___webviewdll___soname_flags = \
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_USE_SOVERLINUX_1@__webviewdll___soname_flags = $(COND_USE_SOVERLINUX_1___webviewdll___soname_flags)
+COND_USE_SOVERSOLARIS_1___webviewdll___soname_flags = \
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_USE_SOVERSOLARIS_1@__webviewdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___webviewdll___soname_flags)
+COND_USE_SOTWOSYMLINKS_1___webviewdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; \
+       rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOTWOSYMLINKS_1@__webviewdll___so_symlinks_cmd = $(COND_USE_SOTWOSYMLINKS_1___webviewdll___so_symlinks_cmd)
+COND_USE_SOVERSOLARIS_1___webviewdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; \
+       rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOVERSOLARIS_1@__webviewdll___so_symlinks_cmd = $(COND_USE_SOVERSOLARIS_1___webviewdll___so_symlinks_cmd)
+COND_USE_SOTWOSYMLINKS_1___webviewdll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOTWOSYMLINKS_1@__webviewdll___so_symlinks_inst_cmd = $(COND_USE_SOTWOSYMLINKS_1___webviewdll___so_symlinks_inst_cmd)
+COND_USE_SOVERSOLARIS_1___webviewdll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX);
+@COND_USE_SOVERSOLARIS_1@__webviewdll___so_symlinks_inst_cmd = $(COND_USE_SOVERSOLARIS_1___webviewdll___so_symlinks_inst_cmd)
+COND_USE_SOTWOSYMLINKS_1___webviewdll___so_symlinks_uninst_cmd = rm -f \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOTWOSYMLINKS_1@__webviewdll___so_symlinks_uninst_cmd = $(COND_USE_SOTWOSYMLINKS_1___webviewdll___so_symlinks_uninst_cmd)
+COND_USE_SOVERSOLARIS_1___webviewdll___so_symlinks_uninst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOVERSOLARIS_1@__webviewdll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___webviewdll___so_symlinks_uninst_cmd)
+@COND_PLATFORM_WIN32_1@__webviewdll___win32rc = webviewdll_version_rc.o
+@COND_PLATFORM_MACOSX_1@__WEBVIEW_SRC_PLATFORM_OBJECTS_2 \
+@COND_PLATFORM_MACOSX_1@       = webviewdll_osx_webview_webkit.o
+@COND_PLATFORM_UNIX_1@__WEBVIEW_SRC_PLATFORM_OBJECTS_2 \
+@COND_PLATFORM_UNIX_1@ = webviewdll_gtk_webview_webkit.o
+@COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS_2 = \
+@COND_TOOLKIT_MSW@     webviewdll_webview_ie.o
+COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1___webviewlib___depname = \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1@__webviewlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1___webviewlib___depname)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1@__install_webviewlib___depname \
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1@   = install_webviewlib
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1@__uninstall_webviewlib___depname \
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1@   = \
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1@   uninstall_webviewlib
+@COND_GCC_PCH_1@__webviewlib_PCH_INC = -I./.pch/wxprec_webviewlib
+@COND_ICC_PCH_1@__webviewlib_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_webviewlib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_webviewlib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_webviewlib/wx/wxprec.h.gch
+@COND_PLATFORM_MACOSX_1@__WEBVIEW_SRC_PLATFORM_OBJECTS_3 \
+@COND_PLATFORM_MACOSX_1@       = webviewlib_osx_webview_webkit.o
+@COND_PLATFORM_UNIX_1@__WEBVIEW_SRC_PLATFORM_OBJECTS_3 \
+@COND_PLATFORM_UNIX_1@ = webviewlib_gtk_webview_webkit.o
+@COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS_3 = \
+@COND_TOOLKIT_MSW@     webviewlib_webview_ie.o
+@COND_SHARED_1@____wxwebview_namedll_DEP = $(__webviewdll___depname)
+@COND_SHARED_0@____wxwebview_namelib_DEP = $(__webviewlib___depname)
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1___qadll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@__qadll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1___qadll___depname)
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1___qadll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@__qadll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1___qadll___depname)
@@ -11118,18 +12368,18 @@ COND_PLATFORM_OS2_1___qadll___importlib = -import \
  COND_WINDOWS_IMPLIB_1___qadll___importlib = \
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__qadll___importlib = $(COND_WINDOWS_IMPLIB_1___qadll___importlib)
  COND_WINDOWS_IMPLIB_1___qadll___importlib = \
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__qadll___importlib = $(COND_WINDOWS_IMPLIB_1___qadll___importlib)
-@COND_GCC_PCH_1@__qadll_PCH_INC = -I.pch/wxprec_qadll
-@COND_ICC_PCH_1@__qadll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_qadll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_qadll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_qadll/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__qadll_PCH_INC = -I./.pch/wxprec_qadll
+@COND_ICC_PCH_1@__qadll_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_qadll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_qadll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_qadll/wx/wxprec.h.gch
  COND_USE_SOVERLINUX_1___qadll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_USE_SOVERLINUX_1@__qadll___soname_flags = $(COND_USE_SOVERLINUX_1___qadll___soname_flags)
  COND_USE_SOVERSOLARIS_1___qadll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_USE_SOVERSOLARIS_1@__qadll___soname_flags = $(COND_USE_SOVERSOLARIS_1___qadll___soname_flags)
  COND_USE_SOVERLINUX_1___qadll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_USE_SOVERLINUX_1@__qadll___soname_flags = $(COND_USE_SOVERLINUX_1___qadll___soname_flags)
  COND_USE_SOVERSOLARIS_1___qadll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_USE_SOVERSOLARIS_1@__qadll___soname_flags = $(COND_USE_SOVERSOLARIS_1___qadll___soname_flags)
-COND_USE_SOSYMLINKS_1___qadll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+COND_USE_SOTWOSYMLINKS_1___qadll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
@@ -11138,8 +12388,14 @@ COND_USE_SOSYMLINKS_1___qadll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__qadll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___qadll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___qadll___so_symlinks_inst_cmd = rm -f \
+@COND_USE_SOTWOSYMLINKS_1@__qadll___so_symlinks_cmd = $(COND_USE_SOTWOSYMLINKS_1___qadll___so_symlinks_cmd)
+COND_USE_SOVERSOLARIS_1___qadll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOVERSOLARIS_1@__qadll___so_symlinks_cmd = $(COND_USE_SOVERSOLARIS_1___qadll___so_symlinks_cmd)
+COND_USE_SOTWOSYMLINKS_1___qadll___so_symlinks_inst_cmd = rm -f \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
@@ -11148,11 +12404,20 @@ COND_USE_SOSYMLINKS_1___qadll___so_symlinks_inst_cmd = rm -f \
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__qadll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___qadll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___qadll___so_symlinks_uninst_cmd = rm -f \
+@COND_USE_SOTWOSYMLINKS_1@__qadll___so_symlinks_inst_cmd = $(COND_USE_SOTWOSYMLINKS_1___qadll___so_symlinks_inst_cmd)
+COND_USE_SOVERSOLARIS_1___qadll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX);
+@COND_USE_SOVERSOLARIS_1@__qadll___so_symlinks_inst_cmd = $(COND_USE_SOVERSOLARIS_1___qadll___so_symlinks_inst_cmd)
+COND_USE_SOTWOSYMLINKS_1___qadll___so_symlinks_uninst_cmd = rm -f \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__qadll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___qadll___so_symlinks_uninst_cmd)
+@COND_USE_SOTWOSYMLINKS_1@__qadll___so_symlinks_uninst_cmd = $(COND_USE_SOTWOSYMLINKS_1___qadll___so_symlinks_uninst_cmd)
+COND_USE_SOVERSOLARIS_1___qadll___so_symlinks_uninst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOVERSOLARIS_1@__qadll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___qadll___so_symlinks_uninst_cmd)
  @COND_PLATFORM_WIN32_1@__qadll___win32rc = qadll_version_rc.o
  COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1___qalib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_PLATFORM_WIN32_1@__qadll___win32rc = qadll_version_rc.o
  COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1___qalib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@@ -11161,11 +12426,11 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1___qalib___depname = \
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@        = install_qalib
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@__uninstall_qalib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@        = uninstall_qalib
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@        = install_qalib
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@__uninstall_qalib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@        = uninstall_qalib
-@COND_GCC_PCH_1@__qalib_PCH_INC = -I.pch/wxprec_qalib
-@COND_ICC_PCH_1@__qalib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_qalib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_qalib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_qalib/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__qalib_PCH_INC = -I./.pch/wxprec_qalib
+@COND_ICC_PCH_1@__qalib_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_qalib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_qalib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_qalib/wx/wxprec.h.gch
  @COND_SHARED_1@____wxqa_namedll_DEP = $(__qadll___depname)
  @COND_SHARED_0@____wxqa_namelib_DEP = $(__qalib___depname)
  COND_MONOLITHIC_0_SHARED_1___xmldll___depname = \
  @COND_SHARED_1@____wxqa_namedll_DEP = $(__qadll___depname)
  @COND_SHARED_0@____wxqa_namelib_DEP = $(__qalib___depname)
  COND_MONOLITHIC_0_SHARED_1___xmldll___depname = \
@@ -11182,18 +12447,18 @@ COND_PLATFORM_OS2_1___xmldll___importlib = -import \
  COND_WINDOWS_IMPLIB_1___xmldll___importlib = \
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__xmldll___importlib = $(COND_WINDOWS_IMPLIB_1___xmldll___importlib)
  COND_WINDOWS_IMPLIB_1___xmldll___importlib = \
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__xmldll___importlib = $(COND_WINDOWS_IMPLIB_1___xmldll___importlib)
-@COND_GCC_PCH_1@__xmldll_PCH_INC = -I.pch/wxprec_xmldll
-@COND_ICC_PCH_1@__xmldll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_xmldll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_xmldll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_xmldll/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__xmldll_PCH_INC = -I./.pch/wxprec_xmldll
+@COND_ICC_PCH_1@__xmldll_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_xmldll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_xmldll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_xmldll/wx/wxprec.h.gch
  COND_USE_SOVERLINUX_1___xmldll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_USE_SOVERLINUX_1@__xmldll___soname_flags = $(COND_USE_SOVERLINUX_1___xmldll___soname_flags)
  COND_USE_SOVERSOLARIS_1___xmldll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_USE_SOVERSOLARIS_1@__xmldll___soname_flags = $(COND_USE_SOVERSOLARIS_1___xmldll___soname_flags)
  COND_USE_SOVERLINUX_1___xmldll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_USE_SOVERLINUX_1@__xmldll___soname_flags = $(COND_USE_SOVERLINUX_1___xmldll___soname_flags)
  COND_USE_SOVERSOLARIS_1___xmldll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_USE_SOVERSOLARIS_1@__xmldll___soname_flags = $(COND_USE_SOVERSOLARIS_1___xmldll___soname_flags)
-COND_USE_SOSYMLINKS_1___xmldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+COND_USE_SOTWOSYMLINKS_1___xmldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
@@ -11202,8 +12467,14 @@ COND_USE_SOSYMLINKS_1___xmldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__xmldll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___xmldll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___xmldll___so_symlinks_inst_cmd = rm -f \
+@COND_USE_SOTWOSYMLINKS_1@__xmldll___so_symlinks_cmd = $(COND_USE_SOTWOSYMLINKS_1___xmldll___so_symlinks_cmd)
+COND_USE_SOVERSOLARIS_1___xmldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOVERSOLARIS_1@__xmldll___so_symlinks_cmd = $(COND_USE_SOVERSOLARIS_1___xmldll___so_symlinks_cmd)
+COND_USE_SOTWOSYMLINKS_1___xmldll___so_symlinks_inst_cmd = rm -f \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
@@ -11212,22 +12483,31 @@ COND_USE_SOSYMLINKS_1___xmldll___so_symlinks_inst_cmd = rm -f \
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__xmldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___xmldll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___xmldll___so_symlinks_uninst_cmd = rm -f \
+@COND_USE_SOTWOSYMLINKS_1@__xmldll___so_symlinks_inst_cmd = $(COND_USE_SOTWOSYMLINKS_1___xmldll___so_symlinks_inst_cmd)
+COND_USE_SOVERSOLARIS_1___xmldll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX);
+@COND_USE_SOVERSOLARIS_1@__xmldll___so_symlinks_inst_cmd = $(COND_USE_SOVERSOLARIS_1___xmldll___so_symlinks_inst_cmd)
+COND_USE_SOTWOSYMLINKS_1___xmldll___so_symlinks_uninst_cmd = rm -f \
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__xmldll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___xmldll___so_symlinks_uninst_cmd)
+@COND_USE_SOTWOSYMLINKS_1@__xmldll___so_symlinks_uninst_cmd = $(COND_USE_SOTWOSYMLINKS_1___xmldll___so_symlinks_uninst_cmd)
+COND_USE_SOVERSOLARIS_1___xmldll___so_symlinks_uninst_cmd = rm -f \
+       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOVERSOLARIS_1@__xmldll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___xmldll___so_symlinks_uninst_cmd)
  @COND_PLATFORM_WIN32_1@__xmldll___win32rc = xmldll_version_rc.o
  COND_MONOLITHIC_0_SHARED_0___xmllib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_MONOLITHIC_0_SHARED_0@__xmllib___depname = $(COND_MONOLITHIC_0_SHARED_0___xmllib___depname)
  @COND_MONOLITHIC_0_SHARED_0@__install_xmllib___depname = install_xmllib
  @COND_MONOLITHIC_0_SHARED_0@__uninstall_xmllib___depname = uninstall_xmllib
  @COND_PLATFORM_WIN32_1@__xmldll___win32rc = xmldll_version_rc.o
  COND_MONOLITHIC_0_SHARED_0___xmllib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_MONOLITHIC_0_SHARED_0@__xmllib___depname = $(COND_MONOLITHIC_0_SHARED_0___xmllib___depname)
  @COND_MONOLITHIC_0_SHARED_0@__install_xmllib___depname = install_xmllib
  @COND_MONOLITHIC_0_SHARED_0@__uninstall_xmllib___depname = uninstall_xmllib
-@COND_GCC_PCH_1@__xmllib_PCH_INC = -I.pch/wxprec_xmllib
-@COND_ICC_PCH_1@__xmllib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_xmllib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_xmllib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_xmllib/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__xmllib_PCH_INC = -I./.pch/wxprec_xmllib
+@COND_ICC_PCH_1@__xmllib_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_xmllib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_xmllib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_xmllib/wx/wxprec.h.gch
  @COND_SHARED_1@____wxxml_namedll_DEP = $(__xmldll___depname)
  @COND_SHARED_0@____wxxml_namelib_DEP = $(__xmllib___depname)
  COND_MONOLITHIC_0_SHARED_1_USE_XRC_1___xrcdll___depname = \
  @COND_SHARED_1@____wxxml_namedll_DEP = $(__xmldll___depname)
  @COND_SHARED_0@____wxxml_namelib_DEP = $(__xmllib___depname)
  COND_MONOLITHIC_0_SHARED_1_USE_XRC_1___xrcdll___depname = \
@@ -11246,18 +12526,18 @@ COND_PLATFORM_OS2_1___xrcdll___importlib = -import \
  COND_WINDOWS_IMPLIB_1___xrcdll___importlib = \
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__xrcdll___importlib = $(COND_WINDOWS_IMPLIB_1___xrcdll___importlib)
  COND_WINDOWS_IMPLIB_1___xrcdll___importlib = \
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__xrcdll___importlib = $(COND_WINDOWS_IMPLIB_1___xrcdll___importlib)
-@COND_GCC_PCH_1@__xrcdll_PCH_INC = -I.pch/wxprec_xrcdll
-@COND_ICC_PCH_1@__xrcdll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_xrcdll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_xrcdll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_xrcdll/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__xrcdll_PCH_INC = -I./.pch/wxprec_xrcdll
+@COND_ICC_PCH_1@__xrcdll_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_xrcdll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_xrcdll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_xrcdll/wx/wxprec.h.gch
  COND_USE_SOVERLINUX_1___xrcdll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_USE_SOVERLINUX_1@__xrcdll___soname_flags = $(COND_USE_SOVERLINUX_1___xrcdll___soname_flags)
  COND_USE_SOVERSOLARIS_1___xrcdll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_USE_SOVERSOLARIS_1@__xrcdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___xrcdll___soname_flags)
  COND_USE_SOVERLINUX_1___xrcdll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_USE_SOVERLINUX_1@__xrcdll___soname_flags = $(COND_USE_SOVERLINUX_1___xrcdll___soname_flags)
  COND_USE_SOVERSOLARIS_1___xrcdll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_USE_SOVERSOLARIS_1@__xrcdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___xrcdll___soname_flags)
-COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+COND_USE_SOTWOSYMLINKS_1___xrcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
@@ -11266,8 +12546,14 @@ COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_inst_cmd = rm -f \
+@COND_USE_SOTWOSYMLINKS_1@__xrcdll___so_symlinks_cmd = $(COND_USE_SOTWOSYMLINKS_1___xrcdll___so_symlinks_cmd)
+COND_USE_SOVERSOLARIS_1___xrcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOVERSOLARIS_1@__xrcdll___so_symlinks_cmd = $(COND_USE_SOVERSOLARIS_1___xrcdll___so_symlinks_cmd)
+COND_USE_SOTWOSYMLINKS_1___xrcdll___so_symlinks_inst_cmd = rm -f \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
@@ -11276,11 +12562,20 @@ COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_inst_cmd = rm -f \
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_uninst_cmd = rm -f \
+@COND_USE_SOTWOSYMLINKS_1@__xrcdll___so_symlinks_inst_cmd = $(COND_USE_SOTWOSYMLINKS_1___xrcdll___so_symlinks_inst_cmd)
+COND_USE_SOVERSOLARIS_1___xrcdll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX);
+@COND_USE_SOVERSOLARIS_1@__xrcdll___so_symlinks_inst_cmd = $(COND_USE_SOVERSOLARIS_1___xrcdll___so_symlinks_inst_cmd)
+COND_USE_SOTWOSYMLINKS_1___xrcdll___so_symlinks_uninst_cmd = rm -f \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_uninst_cmd)
+@COND_USE_SOTWOSYMLINKS_1@__xrcdll___so_symlinks_uninst_cmd = $(COND_USE_SOTWOSYMLINKS_1___xrcdll___so_symlinks_uninst_cmd)
+COND_USE_SOVERSOLARIS_1___xrcdll___so_symlinks_uninst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOVERSOLARIS_1@__xrcdll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___xrcdll___so_symlinks_uninst_cmd)
  @COND_PLATFORM_WIN32_1@__xrcdll___win32rc = xrcdll_version_rc.o
  COND_MONOLITHIC_0_SHARED_0_USE_XRC_1___xrclib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_PLATFORM_WIN32_1@__xrcdll___win32rc = xrcdll_version_rc.o
  COND_MONOLITHIC_0_SHARED_0_USE_XRC_1___xrclib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@@ -11289,11 +12584,11 @@ COND_MONOLITHIC_0_SHARED_0_USE_XRC_1___xrclib___depname = \
  @COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ = install_xrclib
  @COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@__uninstall_xrclib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ = uninstall_xrclib
  @COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ = install_xrclib
  @COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@__uninstall_xrclib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ = uninstall_xrclib
-@COND_GCC_PCH_1@__xrclib_PCH_INC = -I.pch/wxprec_xrclib
-@COND_ICC_PCH_1@__xrclib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_xrclib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_xrclib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_xrclib/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__xrclib_PCH_INC = -I./.pch/wxprec_xrclib
+@COND_ICC_PCH_1@__xrclib_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_xrclib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_xrclib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_xrclib/wx/wxprec.h.gch
  @COND_SHARED_1@____wxxrc_namedll_DEP = $(__xrcdll___depname)
  @COND_SHARED_0@____wxxrc_namelib_DEP = $(__xrclib___depname)
  COND_MONOLITHIC_0_SHARED_1_USE_AUI_1___auidll___depname = \
  @COND_SHARED_1@____wxxrc_namedll_DEP = $(__xrcdll___depname)
  @COND_SHARED_0@____wxxrc_namelib_DEP = $(__xrclib___depname)
  COND_MONOLITHIC_0_SHARED_1_USE_AUI_1___auidll___depname = \
@@ -11312,18 +12607,18 @@ COND_PLATFORM_OS2_1___auidll___importlib = -import \
  COND_WINDOWS_IMPLIB_1___auidll___importlib = \
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__auidll___importlib = $(COND_WINDOWS_IMPLIB_1___auidll___importlib)
  COND_WINDOWS_IMPLIB_1___auidll___importlib = \
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__auidll___importlib = $(COND_WINDOWS_IMPLIB_1___auidll___importlib)
-@COND_GCC_PCH_1@__auidll_PCH_INC = -I.pch/wxprec_auidll
-@COND_ICC_PCH_1@__auidll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_auidll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_auidll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_auidll/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__auidll_PCH_INC = -I./.pch/wxprec_auidll
+@COND_ICC_PCH_1@__auidll_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_auidll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_auidll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_auidll/wx/wxprec.h.gch
  COND_USE_SOVERLINUX_1___auidll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_USE_SOVERLINUX_1@__auidll___soname_flags = $(COND_USE_SOVERLINUX_1___auidll___soname_flags)
  COND_USE_SOVERSOLARIS_1___auidll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_USE_SOVERSOLARIS_1@__auidll___soname_flags = $(COND_USE_SOVERSOLARIS_1___auidll___soname_flags)
  COND_USE_SOVERLINUX_1___auidll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_USE_SOVERLINUX_1@__auidll___soname_flags = $(COND_USE_SOVERLINUX_1___auidll___soname_flags)
  COND_USE_SOVERSOLARIS_1___auidll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_USE_SOVERSOLARIS_1@__auidll___soname_flags = $(COND_USE_SOVERSOLARIS_1___auidll___soname_flags)
-COND_USE_SOSYMLINKS_1___auidll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+COND_USE_SOTWOSYMLINKS_1___auidll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
@@ -11332,8 +12627,14 @@ COND_USE_SOSYMLINKS_1___auidll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__auidll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___auidll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___auidll___so_symlinks_inst_cmd = rm -f \
+@COND_USE_SOTWOSYMLINKS_1@__auidll___so_symlinks_cmd = $(COND_USE_SOTWOSYMLINKS_1___auidll___so_symlinks_cmd)
+COND_USE_SOVERSOLARIS_1___auidll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOVERSOLARIS_1@__auidll___so_symlinks_cmd = $(COND_USE_SOVERSOLARIS_1___auidll___so_symlinks_cmd)
+COND_USE_SOTWOSYMLINKS_1___auidll___so_symlinks_inst_cmd = rm -f \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
@@ -11342,11 +12643,20 @@ COND_USE_SOSYMLINKS_1___auidll___so_symlinks_inst_cmd = rm -f \
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__auidll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___auidll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___auidll___so_symlinks_uninst_cmd = rm -f \
+@COND_USE_SOTWOSYMLINKS_1@__auidll___so_symlinks_inst_cmd = $(COND_USE_SOTWOSYMLINKS_1___auidll___so_symlinks_inst_cmd)
+COND_USE_SOVERSOLARIS_1___auidll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX);
+@COND_USE_SOVERSOLARIS_1@__auidll___so_symlinks_inst_cmd = $(COND_USE_SOVERSOLARIS_1___auidll___so_symlinks_inst_cmd)
+COND_USE_SOTWOSYMLINKS_1___auidll___so_symlinks_uninst_cmd = rm -f \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__auidll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___auidll___so_symlinks_uninst_cmd)
+@COND_USE_SOTWOSYMLINKS_1@__auidll___so_symlinks_uninst_cmd = $(COND_USE_SOTWOSYMLINKS_1___auidll___so_symlinks_uninst_cmd)
+COND_USE_SOVERSOLARIS_1___auidll___so_symlinks_uninst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOVERSOLARIS_1@__auidll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___auidll___so_symlinks_uninst_cmd)
  @COND_PLATFORM_WIN32_1@__auidll___win32rc = auidll_version_rc.o
  COND_MONOLITHIC_0_SHARED_0_USE_AUI_1___auilib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_PLATFORM_WIN32_1@__auidll___win32rc = auidll_version_rc.o
  COND_MONOLITHIC_0_SHARED_0_USE_AUI_1___auilib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@@ -11355,13 +12665,181 @@ COND_MONOLITHIC_0_SHARED_0_USE_AUI_1___auilib___depname = \
  @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@ = install_auilib
  @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@__uninstall_auilib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@ = uninstall_auilib
  @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@ = install_auilib
  @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@__uninstall_auilib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@ = uninstall_auilib
-@COND_GCC_PCH_1@__auilib_PCH_INC = -I.pch/wxprec_auilib
-@COND_ICC_PCH_1@__auilib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_auilib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_auilib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_auilib/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__auilib_PCH_INC = -I./.pch/wxprec_auilib
+@COND_ICC_PCH_1@__auilib_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_auilib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_auilib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_auilib/wx/wxprec.h.gch
  @COND_SHARED_1@____wxaui_namedll_DEP = $(__auidll___depname)
  @COND_SHARED_0@____wxaui_namelib_DEP = $(__auilib___depname)
  @COND_SHARED_1@____wxaui_namedll_DEP = $(__auidll___depname)
  @COND_SHARED_0@____wxaui_namelib_DEP = $(__auilib___depname)
+COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1___ribbondll___depname = \
+       $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@__ribbondll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1___ribbondll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@__install_ribbondll___depname \
+@COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@      = install_ribbondll
+@COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@__uninstall_ribbondll___depname \
+@COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@      = uninstall_ribbondll
+COND_PLATFORM_MACOSX_1___ribbondll___macinstnamecmd = -install_name \
+       $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_PLATFORM_MACOSX_1@__ribbondll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___ribbondll___macinstnamecmd)
+COND_PLATFORM_OS2_1___ribbondll___importlib = -import \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_PLATFORM_OS2_1@__ribbondll___importlib = $(COND_PLATFORM_OS2_1___ribbondll___importlib)
+COND_WINDOWS_IMPLIB_1___ribbondll___importlib = \
+       -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_WINDOWS_IMPLIB_1@__ribbondll___importlib = $(COND_WINDOWS_IMPLIB_1___ribbondll___importlib)
+@COND_GCC_PCH_1@__ribbondll_PCH_INC = -I./.pch/wxprec_ribbondll
+@COND_ICC_PCH_1@__ribbondll_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_ribbondll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_ribbondll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_ribbondll/wx/wxprec.h.gch
+COND_USE_SOVERLINUX_1___ribbondll___soname_flags = \
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_USE_SOVERLINUX_1@__ribbondll___soname_flags = $(COND_USE_SOVERLINUX_1___ribbondll___soname_flags)
+COND_USE_SOVERSOLARIS_1___ribbondll___soname_flags = \
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_USE_SOVERSOLARIS_1@__ribbondll___soname_flags = $(COND_USE_SOVERSOLARIS_1___ribbondll___soname_flags)
+COND_USE_SOTWOSYMLINKS_1___ribbondll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; \
+       rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOTWOSYMLINKS_1@__ribbondll___so_symlinks_cmd = $(COND_USE_SOTWOSYMLINKS_1___ribbondll___so_symlinks_cmd)
+COND_USE_SOVERSOLARIS_1___ribbondll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm \
+       -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOVERSOLARIS_1@__ribbondll___so_symlinks_cmd = $(COND_USE_SOVERSOLARIS_1___ribbondll___so_symlinks_cmd)
+COND_USE_SOTWOSYMLINKS_1___ribbondll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOTWOSYMLINKS_1@__ribbondll___so_symlinks_inst_cmd = $(COND_USE_SOTWOSYMLINKS_1___ribbondll___so_symlinks_inst_cmd)
+COND_USE_SOVERSOLARIS_1___ribbondll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX);
+@COND_USE_SOVERSOLARIS_1@__ribbondll___so_symlinks_inst_cmd = $(COND_USE_SOVERSOLARIS_1___ribbondll___so_symlinks_inst_cmd)
+COND_USE_SOTWOSYMLINKS_1___ribbondll___so_symlinks_uninst_cmd = rm -f \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOTWOSYMLINKS_1@__ribbondll___so_symlinks_uninst_cmd = $(COND_USE_SOTWOSYMLINKS_1___ribbondll___so_symlinks_uninst_cmd)
+COND_USE_SOVERSOLARIS_1___ribbondll___so_symlinks_uninst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOVERSOLARIS_1@__ribbondll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___ribbondll___so_symlinks_uninst_cmd)
+@COND_PLATFORM_WIN32_1@__ribbondll___win32rc = ribbondll_version_rc.o
+COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1___ribbonlib___depname = \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1@__ribbonlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1___ribbonlib___depname)
+@COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1@__install_ribbonlib___depname \
+@COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1@      = install_ribbonlib
+@COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1@__uninstall_ribbonlib___depname \
+@COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1@      = uninstall_ribbonlib
+@COND_GCC_PCH_1@__ribbonlib_PCH_INC = -I./.pch/wxprec_ribbonlib
+@COND_ICC_PCH_1@__ribbonlib_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_ribbonlib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_ribbonlib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_ribbonlib/wx/wxprec.h.gch
+@COND_SHARED_1@____wxribbon_namedll_DEP = $(__ribbondll___depname)
+@COND_SHARED_0@____wxribbon_namelib_DEP = $(__ribbonlib___depname)
+COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1___propgriddll___depname = \
+       $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@__propgriddll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1___propgriddll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@__install_propgriddll___depname \
+@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@    = install_propgriddll
+@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@__uninstall_propgriddll___depname \
+@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@    = uninstall_propgriddll
+COND_PLATFORM_MACOSX_1___propgriddll___macinstnamecmd = -install_name \
+       $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_PLATFORM_MACOSX_1@__propgriddll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___propgriddll___macinstnamecmd)
+COND_PLATFORM_OS2_1___propgriddll___importlib = -import \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_PLATFORM_OS2_1@__propgriddll___importlib = $(COND_PLATFORM_OS2_1___propgriddll___importlib)
+COND_WINDOWS_IMPLIB_1___propgriddll___importlib = \
+       -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_WINDOWS_IMPLIB_1@__propgriddll___importlib = $(COND_WINDOWS_IMPLIB_1___propgriddll___importlib)
+@COND_GCC_PCH_1@__propgriddll_PCH_INC = -I./.pch/wxprec_propgriddll
+@COND_ICC_PCH_1@__propgriddll_PCH_INC = \
+@COND_ICC_PCH_1@       $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_propgriddll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_propgriddll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_propgriddll/wx/wxprec.h.gch
+COND_USE_SOVERLINUX_1___propgriddll___soname_flags = \
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_USE_SOVERLINUX_1@__propgriddll___soname_flags = $(COND_USE_SOVERLINUX_1___propgriddll___soname_flags)
+COND_USE_SOVERSOLARIS_1___propgriddll___soname_flags = \
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_USE_SOVERSOLARIS_1@__propgriddll___soname_flags = $(COND_USE_SOVERSOLARIS_1___propgriddll___soname_flags)
+COND_USE_SOTWOSYMLINKS_1___propgriddll___so_symlinks_cmd = (cd \
+       $(LIBDIRNAME)/; rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOTWOSYMLINKS_1@__propgriddll___so_symlinks_cmd = $(COND_USE_SOTWOSYMLINKS_1___propgriddll___so_symlinks_cmd)
+COND_USE_SOVERSOLARIS_1___propgriddll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; \
+       rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOVERSOLARIS_1@__propgriddll___so_symlinks_cmd = $(COND_USE_SOVERSOLARIS_1___propgriddll___so_symlinks_cmd)
+COND_USE_SOTWOSYMLINKS_1___propgriddll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOTWOSYMLINKS_1@__propgriddll___so_symlinks_inst_cmd = $(COND_USE_SOTWOSYMLINKS_1___propgriddll___so_symlinks_inst_cmd)
+COND_USE_SOVERSOLARIS_1___propgriddll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX);
+@COND_USE_SOVERSOLARIS_1@__propgriddll___so_symlinks_inst_cmd = $(COND_USE_SOVERSOLARIS_1___propgriddll___so_symlinks_inst_cmd)
+COND_USE_SOTWOSYMLINKS_1___propgriddll___so_symlinks_uninst_cmd = rm -f \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOTWOSYMLINKS_1@__propgriddll___so_symlinks_uninst_cmd = $(COND_USE_SOTWOSYMLINKS_1___propgriddll___so_symlinks_uninst_cmd)
+COND_USE_SOVERSOLARIS_1___propgriddll___so_symlinks_uninst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOVERSOLARIS_1@__propgriddll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___propgriddll___so_symlinks_uninst_cmd)
+@COND_PLATFORM_WIN32_1@__propgriddll___win32rc = propgriddll_version_rc.o
+COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1___propgridlib___depname = \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1@__propgridlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1___propgridlib___depname)
+@COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1@__install_propgridlib___depname \
+@COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1@    = install_propgridlib
+@COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1@__uninstall_propgridlib___depname \
+@COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1@    = uninstall_propgridlib
+@COND_GCC_PCH_1@__propgridlib_PCH_INC = -I./.pch/wxprec_propgridlib
+@COND_ICC_PCH_1@__propgridlib_PCH_INC = \
+@COND_ICC_PCH_1@       $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_propgridlib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_propgridlib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_propgridlib/wx/wxprec.h.gch
+@COND_SHARED_1@____wxpropgrid_namedll_DEP = $(__propgriddll___depname)
+@COND_SHARED_0@____wxpropgrid_namelib_DEP = $(__propgridlib___depname)
  COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1___richtextdll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@__richtextdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1___richtextdll___depname)
  COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1___richtextdll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@__richtextdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1___richtextdll___depname)
@@ -11378,19 +12856,20 @@ COND_PLATFORM_OS2_1___richtextdll___importlib = -import \
  COND_WINDOWS_IMPLIB_1___richtextdll___importlib = \
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__richtextdll___importlib = $(COND_WINDOWS_IMPLIB_1___richtextdll___importlib)
  COND_WINDOWS_IMPLIB_1___richtextdll___importlib = \
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__richtextdll___importlib = $(COND_WINDOWS_IMPLIB_1___richtextdll___importlib)
-@COND_GCC_PCH_1@__richtextdll_PCH_INC = -I.pch/wxprec_richtextdll
-@COND_ICC_PCH_1@__richtextdll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_richtextdll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_richtextdll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_richtextdll/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__richtextdll_PCH_INC = -I./.pch/wxprec_richtextdll
+@COND_ICC_PCH_1@__richtextdll_PCH_INC = \
+@COND_ICC_PCH_1@       $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_richtextdll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_richtextdll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_richtextdll/wx/wxprec.h.gch
  COND_USE_SOVERLINUX_1___richtextdll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_USE_SOVERLINUX_1@__richtextdll___soname_flags = $(COND_USE_SOVERLINUX_1___richtextdll___soname_flags)
  COND_USE_SOVERSOLARIS_1___richtextdll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_USE_SOVERSOLARIS_1@__richtextdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___richtextdll___soname_flags)
  COND_USE_SOVERLINUX_1___richtextdll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_USE_SOVERLINUX_1@__richtextdll___soname_flags = $(COND_USE_SOVERLINUX_1___richtextdll___soname_flags)
  COND_USE_SOVERSOLARIS_1___richtextdll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_USE_SOVERSOLARIS_1@__richtextdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___richtextdll___soname_flags)
-COND_USE_SOSYMLINKS_1___richtextdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm \
-       -f \
+COND_USE_SOTWOSYMLINKS_1___richtextdll___so_symlinks_cmd = (cd \
+       $(LIBDIRNAME)/; rm -f \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
@@ -11399,8 +12878,15 @@ COND_USE_SOSYMLINKS_1___richtextdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm \
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__richtextdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___richtextdll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___richtextdll___so_symlinks_inst_cmd = rm -f \
+@COND_USE_SOTWOSYMLINKS_1@__richtextdll___so_symlinks_cmd = $(COND_USE_SOTWOSYMLINKS_1___richtextdll___so_symlinks_cmd)
+COND_USE_SOVERSOLARIS_1___richtextdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; \
+       rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOVERSOLARIS_1@__richtextdll___so_symlinks_cmd = $(COND_USE_SOVERSOLARIS_1___richtextdll___so_symlinks_cmd)
+COND_USE_SOTWOSYMLINKS_1___richtextdll___so_symlinks_inst_cmd = rm -f \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
@@ -11409,11 +12895,20 @@ COND_USE_SOSYMLINKS_1___richtextdll___so_symlinks_inst_cmd = rm -f \
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__richtextdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___richtextdll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___richtextdll___so_symlinks_uninst_cmd = rm -f \
+@COND_USE_SOTWOSYMLINKS_1@__richtextdll___so_symlinks_inst_cmd = $(COND_USE_SOTWOSYMLINKS_1___richtextdll___so_symlinks_inst_cmd)
+COND_USE_SOVERSOLARIS_1___richtextdll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX);
+@COND_USE_SOVERSOLARIS_1@__richtextdll___so_symlinks_inst_cmd = $(COND_USE_SOVERSOLARIS_1___richtextdll___so_symlinks_inst_cmd)
+COND_USE_SOTWOSYMLINKS_1___richtextdll___so_symlinks_uninst_cmd = rm -f \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__richtextdll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___richtextdll___so_symlinks_uninst_cmd)
+@COND_USE_SOTWOSYMLINKS_1@__richtextdll___so_symlinks_uninst_cmd = $(COND_USE_SOTWOSYMLINKS_1___richtextdll___so_symlinks_uninst_cmd)
+COND_USE_SOVERSOLARIS_1___richtextdll___so_symlinks_uninst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOVERSOLARIS_1@__richtextdll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___richtextdll___so_symlinks_uninst_cmd)
  @COND_PLATFORM_WIN32_1@__richtextdll___win32rc = richtextdll_version_rc.o
  COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1___richtextlib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_PLATFORM_WIN32_1@__richtextdll___win32rc = richtextdll_version_rc.o
  COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1___richtextlib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@@ -11422,11 +12917,12 @@ COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1___richtextlib___depname = \
  @COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@    = install_richtextlib
  @COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@__uninstall_richtextlib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@    = uninstall_richtextlib
  @COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@    = install_richtextlib
  @COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@__uninstall_richtextlib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@    = uninstall_richtextlib
-@COND_GCC_PCH_1@__richtextlib_PCH_INC = -I.pch/wxprec_richtextlib
-@COND_ICC_PCH_1@__richtextlib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_richtextlib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_richtextlib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_richtextlib/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__richtextlib_PCH_INC = -I./.pch/wxprec_richtextlib
+@COND_ICC_PCH_1@__richtextlib_PCH_INC = \
+@COND_ICC_PCH_1@       $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_richtextlib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_richtextlib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_richtextlib/wx/wxprec.h.gch
  @COND_SHARED_1@____wxrichtext_namedll_DEP = $(__richtextdll___depname)
  @COND_SHARED_0@____wxrichtext_namelib_DEP = $(__richtextlib___depname)
  COND_MONOLITHIC_0_SHARED_1_USE_STC_1___stcdll___depname = \
  @COND_SHARED_1@____wxrichtext_namedll_DEP = $(__richtextdll___depname)
  @COND_SHARED_0@____wxrichtext_namelib_DEP = $(__richtextlib___depname)
  COND_MONOLITHIC_0_SHARED_1_USE_STC_1___stcdll___depname = \
@@ -11445,18 +12941,18 @@ COND_PLATFORM_OS2_1___stcdll___importlib = -import \
  COND_WINDOWS_IMPLIB_1___stcdll___importlib = \
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__stcdll___importlib = $(COND_WINDOWS_IMPLIB_1___stcdll___importlib)
  COND_WINDOWS_IMPLIB_1___stcdll___importlib = \
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__stcdll___importlib = $(COND_WINDOWS_IMPLIB_1___stcdll___importlib)
-@COND_GCC_PCH_1@__stcdll_PCH_INC = -I.pch/wxprec_stcdll
-@COND_ICC_PCH_1@__stcdll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_stcdll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_stcdll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_stcdll/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__stcdll_PCH_INC = -I./.pch/wxprec_stcdll
+@COND_ICC_PCH_1@__stcdll_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_stcdll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_stcdll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_stcdll/wx/wxprec.h.gch
  COND_USE_SOVERLINUX_1___stcdll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_USE_SOVERLINUX_1@__stcdll___soname_flags = $(COND_USE_SOVERLINUX_1___stcdll___soname_flags)
  COND_USE_SOVERSOLARIS_1___stcdll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_USE_SOVERSOLARIS_1@__stcdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___stcdll___soname_flags)
  COND_USE_SOVERLINUX_1___stcdll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_USE_SOVERLINUX_1@__stcdll___soname_flags = $(COND_USE_SOVERLINUX_1___stcdll___soname_flags)
  COND_USE_SOVERSOLARIS_1___stcdll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_USE_SOVERSOLARIS_1@__stcdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___stcdll___soname_flags)
-COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+COND_USE_SOTWOSYMLINKS_1___stcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
@@ -11465,8 +12961,14 @@ COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__stcdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_inst_cmd = rm -f \
+@COND_USE_SOTWOSYMLINKS_1@__stcdll___so_symlinks_cmd = $(COND_USE_SOTWOSYMLINKS_1___stcdll___so_symlinks_cmd)
+COND_USE_SOVERSOLARIS_1___stcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOVERSOLARIS_1@__stcdll___so_symlinks_cmd = $(COND_USE_SOVERSOLARIS_1___stcdll___so_symlinks_cmd)
+COND_USE_SOTWOSYMLINKS_1___stcdll___so_symlinks_inst_cmd = rm -f \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
@@ -11475,11 +12977,20 @@ COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_inst_cmd = rm -f \
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__stcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_uninst_cmd = rm -f \
+@COND_USE_SOTWOSYMLINKS_1@__stcdll___so_symlinks_inst_cmd = $(COND_USE_SOTWOSYMLINKS_1___stcdll___so_symlinks_inst_cmd)
+COND_USE_SOVERSOLARIS_1___stcdll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX);
+@COND_USE_SOVERSOLARIS_1@__stcdll___so_symlinks_inst_cmd = $(COND_USE_SOVERSOLARIS_1___stcdll___so_symlinks_inst_cmd)
+COND_USE_SOTWOSYMLINKS_1___stcdll___so_symlinks_uninst_cmd = rm -f \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__stcdll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___stcdll___so_symlinks_uninst_cmd)
+@COND_USE_SOTWOSYMLINKS_1@__stcdll___so_symlinks_uninst_cmd = $(COND_USE_SOTWOSYMLINKS_1___stcdll___so_symlinks_uninst_cmd)
+COND_USE_SOVERSOLARIS_1___stcdll___so_symlinks_uninst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOVERSOLARIS_1@__stcdll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___stcdll___so_symlinks_uninst_cmd)
  @COND_PLATFORM_WIN32_1@__stcdll___win32rc = stcdll_version_rc.o
  COND_MONOLITHIC_0_SHARED_0_USE_STC_1___stclib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_PLATFORM_WIN32_1@__stcdll___win32rc = stcdll_version_rc.o
  COND_MONOLITHIC_0_SHARED_0_USE_STC_1___stclib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@@ -11488,11 +12999,11 @@ COND_MONOLITHIC_0_SHARED_0_USE_STC_1___stclib___depname = \
  @COND_MONOLITHIC_0_SHARED_0_USE_STC_1@ = install_stclib
  @COND_MONOLITHIC_0_SHARED_0_USE_STC_1@__uninstall_stclib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_STC_1@ = uninstall_stclib
  @COND_MONOLITHIC_0_SHARED_0_USE_STC_1@ = install_stclib
  @COND_MONOLITHIC_0_SHARED_0_USE_STC_1@__uninstall_stclib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_STC_1@ = uninstall_stclib
-@COND_GCC_PCH_1@__stclib_PCH_INC = -I.pch/wxprec_stclib
-@COND_ICC_PCH_1@__stclib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_stclib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_stclib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_stclib/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__stclib_PCH_INC = -I./.pch/wxprec_stclib
+@COND_ICC_PCH_1@__stclib_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_stclib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_stclib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_stclib/wx/wxprec.h.gch
  @COND_SHARED_1@____wxstc_namedll_DEP = $(__stcdll___depname)
  @COND_SHARED_0@____wxstc_namelib_DEP = $(__stclib___depname)
  COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname = \
  @COND_SHARED_1@____wxstc_namedll_DEP = $(__stcdll___depname)
  @COND_SHARED_0@____wxstc_namelib_DEP = $(__stclib___depname)
  COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname = \
@@ -11511,18 +13022,18 @@ COND_PLATFORM_OS2_1___gldll___importlib = -import \
  COND_WINDOWS_IMPLIB_1___gldll___importlib = \
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__gldll___importlib = $(COND_WINDOWS_IMPLIB_1___gldll___importlib)
  COND_WINDOWS_IMPLIB_1___gldll___importlib = \
         -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__gldll___importlib = $(COND_WINDOWS_IMPLIB_1___gldll___importlib)
-@COND_GCC_PCH_1@__gldll_PCH_INC = -I.pch/wxprec_gldll
-@COND_ICC_PCH_1@__gldll_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_gldll/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_gldll_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_gldll/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__gldll_PCH_INC = -I./.pch/wxprec_gldll
+@COND_ICC_PCH_1@__gldll_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_gldll/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_gldll_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_gldll/wx/wxprec.h.gch
  COND_USE_SOVERLINUX_1___gldll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_USE_SOVERLINUX_1@__gldll___soname_flags = $(COND_USE_SOVERLINUX_1___gldll___soname_flags)
  COND_USE_SOVERSOLARIS_1___gldll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_USE_SOVERSOLARIS_1@__gldll___soname_flags = $(COND_USE_SOVERSOLARIS_1___gldll___soname_flags)
  COND_USE_SOVERLINUX_1___gldll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_USE_SOVERLINUX_1@__gldll___soname_flags = $(COND_USE_SOVERLINUX_1___gldll___soname_flags)
  COND_USE_SOVERSOLARIS_1___gldll___soname_flags = \
         $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_USE_SOVERSOLARIS_1@__gldll___soname_flags = $(COND_USE_SOVERSOLARIS_1___gldll___soname_flags)
-COND_USE_SOSYMLINKS_1___gldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+COND_USE_SOTWOSYMLINKS_1___gldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
@@ -11531,8 +13042,14 @@ COND_USE_SOSYMLINKS_1___gldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__gldll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___gldll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___gldll___so_symlinks_inst_cmd = rm -f \
+@COND_USE_SOTWOSYMLINKS_1@__gldll___so_symlinks_cmd = $(COND_USE_SOTWOSYMLINKS_1___gldll___so_symlinks_cmd)
+COND_USE_SOVERSOLARIS_1___gldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOVERSOLARIS_1@__gldll___so_symlinks_cmd = $(COND_USE_SOVERSOLARIS_1___gldll___so_symlinks_cmd)
+COND_USE_SOTWOSYMLINKS_1___gldll___so_symlinks_inst_cmd = rm -f \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
         $(LN_S) \
@@ -11541,26 +13058,40 @@ COND_USE_SOSYMLINKS_1___gldll___so_symlinks_inst_cmd = rm -f \
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         $(LN_S) \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__gldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___gldll___so_symlinks_inst_cmd)
-COND_USE_SOSYMLINKS_1___gldll___so_symlinks_uninst_cmd = rm -f \
+@COND_USE_SOTWOSYMLINKS_1@__gldll___so_symlinks_inst_cmd = $(COND_USE_SOTWOSYMLINKS_1___gldll___so_symlinks_inst_cmd)
+COND_USE_SOVERSOLARIS_1___gldll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX);
+@COND_USE_SOVERSOLARIS_1@__gldll___so_symlinks_inst_cmd = $(COND_USE_SOVERSOLARIS_1___gldll___so_symlinks_inst_cmd)
+COND_USE_SOTWOSYMLINKS_1___gldll___so_symlinks_uninst_cmd = rm -f \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__gldll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___gldll___so_symlinks_uninst_cmd)
+@COND_USE_SOTWOSYMLINKS_1@__gldll___so_symlinks_uninst_cmd = $(COND_USE_SOTWOSYMLINKS_1___gldll___so_symlinks_uninst_cmd)
+COND_USE_SOVERSOLARIS_1___gldll___so_symlinks_uninst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOVERSOLARIS_1@__gldll___so_symlinks_uninst_cmd = $(COND_USE_SOVERSOLARIS_1___gldll___so_symlinks_uninst_cmd)
  @COND_PLATFORM_WIN32_1@__gldll___win32rc = gldll_version_rc.o
  @COND_PLATFORM_WIN32_1@__gldll___win32rc = gldll_version_rc.o
-@COND_TOOLKIT_COCOA@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_glcanvas.o
+@COND_TOOLKIT_COCOA@__OPENGL_SRC_PLATFORM_OBJECTS = \
+@COND_TOOLKIT_COCOA@   gldll_src_cocoa_glcanvas.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__OPENGL_SRC_PLATFORM_OBJECTS \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__OPENGL_SRC_PLATFORM_OBJECTS \
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    = gldll_glcanvas.o gldll_glx11.o
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    = gldll_gtk1_glcanvas.o gldll_glx11.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__OPENGL_SRC_PLATFORM_OBJECTS \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__OPENGL_SRC_PLATFORM_OBJECTS \
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   = gldll_glcanvas.o gldll_glx11.o
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   = gldll_gtk_glcanvas.o gldll_glx11.o
  @COND_TOOLKIT_MOTIF@__OPENGL_SRC_PLATFORM_OBJECTS = \
  @COND_TOOLKIT_MOTIF@__OPENGL_SRC_PLATFORM_OBJECTS = \
-@COND_TOOLKIT_MOTIF@   gldll_glcanvas.o gldll_glx11.o
-@COND_TOOLKIT_MSW@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_glcanvas.o
+@COND_TOOLKIT_MOTIF@   gldll_x11_glcanvas.o gldll_glx11.o
+@COND_TOOLKIT_MSW@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_msw_glcanvas.o
  @COND_TOOLKIT_OSX_CARBON@__OPENGL_SRC_PLATFORM_OBJECTS \
  @COND_TOOLKIT_OSX_CARBON@__OPENGL_SRC_PLATFORM_OBJECTS \
-@COND_TOOLKIT_OSX_CARBON@      = gldll_glcanvas.o gldll_glcanvas_osx.o
-@COND_TOOLKIT_PM@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_glcanvas.o
-@COND_TOOLKIT_WINCE@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_glcanvas.o
+@COND_TOOLKIT_OSX_CARBON@      = gldll_carbon_glcanvas.o gldll_glcanvas_osx.o
+@COND_TOOLKIT_OSX_COCOA@__OPENGL_SRC_PLATFORM_OBJECTS \
+@COND_TOOLKIT_OSX_COCOA@       = gldll_osx_cocoa_glcanvas.o gldll_glcanvas_osx.o
+@COND_TOOLKIT_OSX_IPHONE@__OPENGL_SRC_PLATFORM_OBJECTS \
+@COND_TOOLKIT_OSX_IPHONE@      = gldll_iphone_glcanvas.o gldll_glcanvas_osx.o
+@COND_TOOLKIT_PM@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_os2_glcanvas.o
+@COND_TOOLKIT_WINCE@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_msw_glcanvas.o
  @COND_TOOLKIT_X11@__OPENGL_SRC_PLATFORM_OBJECTS = \
  @COND_TOOLKIT_X11@__OPENGL_SRC_PLATFORM_OBJECTS = \
-@COND_TOOLKIT_X11@     gldll_glcanvas.o gldll_glx11.o
+@COND_TOOLKIT_X11@     gldll_x11_glcanvas.o gldll_glx11.o
  COND_MONOLITHIC_0___WXLIBGLDEP_CORE_p = \
         -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_0@__WXLIBGLDEP_CORE_p = $(COND_MONOLITHIC_0___WXLIBGLDEP_CORE_p)
  COND_MONOLITHIC_0___WXLIBGLDEP_CORE_p = \
         -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_0@__WXLIBGLDEP_CORE_p = $(COND_MONOLITHIC_0___WXLIBGLDEP_CORE_p)
@@ -11577,29 +13108,34 @@ COND_SHARED_0_USE_GUI_1_USE_OPENGL_1___gllib___depname = \
  @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ = install_gllib
  @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@__uninstall_gllib___depname \
  @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ = uninstall_gllib
  @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ = install_gllib
  @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@__uninstall_gllib___depname \
  @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ = uninstall_gllib
-@COND_GCC_PCH_1@__gllib_PCH_INC = -I.pch/wxprec_gllib
-@COND_ICC_PCH_1@__gllib_PCH_INC = -use_pch \
-@COND_ICC_PCH_1@       .pch/wxprec_gllib/wx/wxprec.h.gch
-@COND_USE_PCH_1@___pch_wxprec_gllib_wx_wxprec_h_gch___depname \
-@COND_USE_PCH_1@       = .pch/wxprec_gllib/wx/wxprec.h.gch
-@COND_TOOLKIT_COCOA@__OPENGL_SRC_PLATFORM_OBJECTS_1 = gllib_glcanvas.o
+@COND_GCC_PCH_1@__gllib_PCH_INC = -I./.pch/wxprec_gllib
+@COND_ICC_PCH_1@__gllib_PCH_INC = $(ICC_PCH_USE_SWITCH) \
+@COND_ICC_PCH_1@       ./.pch/wxprec_gllib/wx/wxprec.h.gch
+@COND_USE_PCH_1@_____pch_wxprec_gllib_wx_wxprec_h_gch___depname \
+@COND_USE_PCH_1@       = ./.pch/wxprec_gllib/wx/wxprec.h.gch
+@COND_TOOLKIT_COCOA@__OPENGL_SRC_PLATFORM_OBJECTS_1 = \
+@COND_TOOLKIT_COCOA@   gllib_src_cocoa_glcanvas.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__OPENGL_SRC_PLATFORM_OBJECTS_1 \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__OPENGL_SRC_PLATFORM_OBJECTS_1 \
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    = gllib_glcanvas.o gllib_glx11.o
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    = gllib_gtk1_glcanvas.o gllib_glx11.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__OPENGL_SRC_PLATFORM_OBJECTS_1 \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__OPENGL_SRC_PLATFORM_OBJECTS_1 \
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   = gllib_glcanvas.o gllib_glx11.o
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   = gllib_gtk_glcanvas.o gllib_glx11.o
  @COND_TOOLKIT_MOTIF@__OPENGL_SRC_PLATFORM_OBJECTS_1 = \
  @COND_TOOLKIT_MOTIF@__OPENGL_SRC_PLATFORM_OBJECTS_1 = \
-@COND_TOOLKIT_MOTIF@   gllib_glcanvas.o gllib_glx11.o
-@COND_TOOLKIT_MSW@__OPENGL_SRC_PLATFORM_OBJECTS_1 = gllib_glcanvas.o
+@COND_TOOLKIT_MOTIF@   gllib_x11_glcanvas.o gllib_glx11.o
+@COND_TOOLKIT_MSW@__OPENGL_SRC_PLATFORM_OBJECTS_1 = gllib_msw_glcanvas.o
  @COND_TOOLKIT_OSX_CARBON@__OPENGL_SRC_PLATFORM_OBJECTS_1 \
  @COND_TOOLKIT_OSX_CARBON@__OPENGL_SRC_PLATFORM_OBJECTS_1 \
-@COND_TOOLKIT_OSX_CARBON@      = gllib_glcanvas.o gllib_glcanvas_osx.o
-@COND_TOOLKIT_PM@__OPENGL_SRC_PLATFORM_OBJECTS_1 = gllib_glcanvas.o
-@COND_TOOLKIT_WINCE@__OPENGL_SRC_PLATFORM_OBJECTS_1 = gllib_glcanvas.o
+@COND_TOOLKIT_OSX_CARBON@      = gllib_carbon_glcanvas.o gllib_glcanvas_osx.o
+@COND_TOOLKIT_OSX_COCOA@__OPENGL_SRC_PLATFORM_OBJECTS_1 \
+@COND_TOOLKIT_OSX_COCOA@       = gllib_osx_cocoa_glcanvas.o gllib_glcanvas_osx.o
+@COND_TOOLKIT_OSX_IPHONE@__OPENGL_SRC_PLATFORM_OBJECTS_1 \
+@COND_TOOLKIT_OSX_IPHONE@      = gllib_iphone_glcanvas.o gllib_glcanvas_osx.o
+@COND_TOOLKIT_PM@__OPENGL_SRC_PLATFORM_OBJECTS_1 = gllib_os2_glcanvas.o
+@COND_TOOLKIT_WINCE@__OPENGL_SRC_PLATFORM_OBJECTS_1 = gllib_msw_glcanvas.o
  @COND_TOOLKIT_X11@__OPENGL_SRC_PLATFORM_OBJECTS_1 = \
  @COND_TOOLKIT_X11@__OPENGL_SRC_PLATFORM_OBJECTS_1 = \
-@COND_TOOLKIT_X11@     gllib_glcanvas.o gllib_glx11.o
+@COND_TOOLKIT_X11@     gllib_x11_glcanvas.o gllib_glx11.o
  @COND_SHARED_1@____wxgl_namedll_DEP = $(__gldll___depname)
  @COND_SHARED_0@____wxgl_namelib_DEP = $(__gllib___depname)
  COND_WITH_PLUGIN_SDL_1___sound_sdl___depname = \
  @COND_SHARED_1@____wxgl_namedll_DEP = $(__gldll___depname)
  @COND_SHARED_0@____wxgl_namelib_DEP = $(__gllib___depname)
  COND_WITH_PLUGIN_SDL_1___sound_sdl___depname = \
-       $(DLLPREFIX_MODULE)sound_sdl$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
+       $(DLLPREFIX_MODULE)sound_sdl$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(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_WITH_PLUGIN_SDL_1@__uninstall_sound_sdl___depname \
  @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_WITH_PLUGIN_SDL_1@__uninstall_sound_sdl___depname \
@@ -11608,63 +13144,27 @@ COND_WITH_PLUGIN_SDL_1___sound_sdl___depname = \
  @COND_USE_XRC_1@__clean_wxrc___depname = clean-wxrc
  @COND_USE_XRC_1@__install_wxrc___depname = install-wxrc
  @COND_TOOLKIT_MSW@RCDEFS_H = msw/rcdefs.h
  @COND_USE_XRC_1@__clean_wxrc___depname = clean-wxrc
  @COND_USE_XRC_1@__install_wxrc___depname = install-wxrc
  @COND_TOOLKIT_MSW@RCDEFS_H = msw/rcdefs.h
-@COND_TOOLKIT_COCOA@__cocoa_res___depname = lib/libwx_$(TOOLCHAIN_NAME).0.r
+@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@__PLATFORM_SRC_OBJECTS = monodll_apptraits.o
  @COND_PLATFORM_UNIX_1@__PLATFORM_SRC_OBJECTS = monodll_apptraits.o
  COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS =  \
  @COND_TOOLKIT_COCOA@__cocoa_res_install___depname = cocoa-res-install
  @COND_SHARED_0@____SHARED = 
  @COND_SHARED_1@____SHARED = $(PIC_FLAG)
  @COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS = monodll_apptraits.o
  @COND_PLATFORM_UNIX_1@__PLATFORM_SRC_OBJECTS = monodll_apptraits.o
  COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS =  \
-       monodll_colordlgosx.o \
-       monodll_fontdlgosx.o \
-       monodll_clipbrd.o \
-       monodll_cursor.o \
-       monodll_fontdlg.o \
-       monodll_gdiobj.o \
-       monodll_icon.o \
-       monodll_app.o \
-       monodll_combobox.o \
-       monodll_control.o \
-       monodll_dataobj.o \
-       monodll_dcclient.o \
-       monodll_dcprint.o \
-       monodll_dcscreen.o \
-       monodll_graphics.o \
-       monodll_dnd.o \
-       monodll_font.o \
-       monodll_frame.o \
-       monodll_metafile.o \
-       monodll_overlay.o \
-       monodll_popupwin.o \
-       monodll_printdlg.o \
-       monodll_renderer.o \
-       monodll_settings.o \
-       monodll_statbrma.o \
-       monodll_tabctrl.o \
-       monodll_tooltip.o \
-       monodll_utilscocoa.o
-@COND_PLATFORM_MACOSX_1@__OSX_CARBON_COCOA_SRC_OBJECTS = $(COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS)
-COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS =  \
-       monodll_accel.o \
-       monodll_artmac.o \
+       monodll_anybutton_osx.o \
         monodll_bmpbuttn_osx.o \
         monodll_bmpbuttn_osx.o \
-       monodll_brush.o \
         monodll_button_osx.o \
         monodll_checkbox_osx.o \
         monodll_checklst_osx.o \
         monodll_choice_osx.o \
         monodll_button_osx.o \
         monodll_checkbox_osx.o \
         monodll_checklst_osx.o \
         monodll_choice_osx.o \
-       monodll_dialog_osx.o \
-       monodll_fontutil.o \
+       monodll_combobox_osx.o \
+       monodll_dnd_osx.o \
         monodll_gauge_osx.o \
         monodll_gauge_osx.o \
-       monodll_imaglist.o \
         monodll_listbox_osx.o \
         monodll_menu_osx.o \
         monodll_menuitem_osx.o \
         monodll_listbox_osx.o \
         monodll_menu_osx.o \
         monodll_menuitem_osx.o \
-       monodll_minifram.o \
-       monodll_nonownedwnd_osx.o \
         monodll_notebook_osx.o \
         monodll_notebook_osx.o \
-       monodll_palette.o \
-       monodll_pen.o \
+       monodll_printdlg_osx.o \
         monodll_radiobox_osx.o \
         monodll_radiobut_osx.o \
         monodll_scrolbar_osx.o \
         monodll_radiobox_osx.o \
         monodll_radiobut_osx.o \
         monodll_scrolbar_osx.o \
@@ -11675,156 +13175,182 @@ COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS =  \
         monodll_statbox_osx.o \
         monodll_statline_osx.o \
         monodll_stattext_osx.o \
         monodll_statbox_osx.o \
         monodll_statline_osx.o \
         monodll_stattext_osx.o \
-       monodll_tabctrl_osx.o \
+       monodll_textentry_osx.o \
         monodll_textctrl_osx.o \
         monodll_tglbtn_osx.o \
         monodll_toolbar_osx.o \
         monodll_textctrl_osx.o \
         monodll_tglbtn_osx.o \
         monodll_toolbar_osx.o \
+       monodll_webkit.o \
+       monodll_colordlgosx.o \
+       monodll_fontdlgosx.o \
+       monodll_osx_accel.o \
+       monodll_carbon_clipbrd.o \
+       monodll_carbon_cursor.o \
+       monodll_carbon_fontdlg.o \
+       monodll_carbon_gdiobj.o \
+       monodll_carbon_icon.o \
+       monodll_carbon_app.o \
+       monodll_carbon_combobox.o \
+       monodll_carbon_control.o \
+       monodll_carbon_dataobj.o \
+       monodll_carbon_dcclient.o \
+       monodll_carbon_dcprint.o \
+       monodll_carbon_dcscreen.o \
+       monodll_glgrab.o \
+       monodll_carbon_graphics.o \
+       monodll_carbon_font.o \
+       monodll_carbon_frame.o \
+       monodll_carbon_mdi.o \
+       monodll_carbon_metafile.o \
+       monodll_carbon_overlay.o \
+       monodll_carbon_popupwin.o \
+       monodll_carbon_renderer.o \
+       monodll_carbon_settings.o \
+       monodll_statbrma.o \
+       monodll_carbon_region.o \
+       monodll_utilscocoa.o \
+       monodll_generic_caret.o \
+       monodll_clrpickerg.o \
+       monodll_collpaneg.o \
+       monodll_colrdlgg.o \
+       monodll_dirdlgg.o \
+       monodll_generic_fdrepdlg.o \
+       monodll_filedlgg.o \
+       monodll_filepickerg.o \
+       monodll_fontdlgg.o \
+       monodll_fontpickerg.o \
+       monodll_generic_listctrl.o \
+       monodll_prntdlgg.o \
+       monodll_generic_statusbr.o
+@COND_PLATFORM_MACOSX_1@__OSX_CARBON_COCOA_SRC_OBJECTS = $(COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS)
+COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS =  \
+       monodll_artmac.o \
+       monodll_osx_brush.o \
+       monodll_dialog_osx.o \
+       monodll_osx_fontutil.o \
+       monodll_osx_imaglist.o \
+       monodll_osx_minifram.o \
+       monodll_nonownedwnd_osx.o \
+       monodll_osx_palette.o \
+       monodll_osx_pen.o \
         monodll_toplevel_osx.o \
         monodll_toplevel_osx.o \
+       monodll_uiaction_osx.o \
         monodll_utils_osx.o \
         monodll_window_osx.o \
         monodll_utils_osx.o \
         monodll_window_osx.o \
-       monodll_bitmap.o \
-       monodll_colour.o \
-       monodll_dcmemory.o \
-       monodll_display.o \
-       monodll_fontenum.o \
+       monodll_core_bitmap.o \
+       monodll_core_colour.o \
+       monodll_core_dcmemory.o \
+       monodll_core_display.o \
+       monodll_core_fontenum.o \
         monodll_hid.o \
         monodll_printmac.o \
         monodll_hid.o \
         monodll_printmac.o \
-       monodll_timer.o \
+       monodll_core_timer.o \
         monodll_utilsexc_cf.o
  @COND_PLATFORM_MACOSX_1@__OSX_LOWLEVEL_SRC_OBJECTS = $(COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS)
  COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS =  \
         monodll_taskbarcmn.o \
         monodll_utilsexc_cf.o
  @COND_PLATFORM_MACOSX_1@__OSX_LOWLEVEL_SRC_OBJECTS = $(COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS)
  COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS =  \
         monodll_taskbarcmn.o \
-       monodll_joystick.o \
-       monodll_sound.o \
+       monodll_unix_joystick.o \
+       monodll_unix_sound.o \
         monodll_taskbarx11.o
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS)
  COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS =  \
         monodll_taskbarx11.o
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS)
  COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS =  \
-       monodll_taskbar.o \
+       monodll_src_cocoa_taskbar.o \
         monodll_taskbarcmn.o \
         monodll_animateg.o \
         monodll_hidjoystick.o
  @COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS =  \
         monodll_taskbarcmn.o \
         monodll_taskbarcmn.o \
         monodll_animateg.o \
         monodll_hidjoystick.o
  @COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS =  \
         monodll_taskbarcmn.o \
-       monodll_joystick.o \
-       monodll_sound.o \
+       monodll_unix_joystick.o \
+       monodll_unix_sound.o \
         monodll_taskbarx11.o \
         monodll_animateg.o \
         monodll_taskbarx11.o \
         monodll_animateg.o \
-       monodll_eggtrayicon.o \
-       monodll_taskbar.o
+       monodll_gtk1_eggtrayicon.o \
+       monodll_gtk1_taskbar.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS =  \
         monodll_taskbarcmn.o \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS =  \
         monodll_taskbarcmn.o \
-       monodll_joystick.o \
-       monodll_sound.o \
+       monodll_unix_joystick.o \
+       monodll_unix_sound.o \
         monodll_taskbarx11.o \
         monodll_taskbarx11.o \
-       monodll_taskbar.o \
-       monodll_eggtrayicon.o \
-       monodll_notifmsg.o
+       monodll_gtk_taskbar.o \
+       monodll_gtk_eggtrayicon.o \
+       monodll_hildon_notifmsg.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS)
  COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS =  \
         monodll_taskbarcmn.o \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS)
  COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS =  \
         monodll_taskbarcmn.o \
-       monodll_joystick.o \
-       monodll_sound.o \
+       monodll_unix_joystick.o \
+       monodll_unix_sound.o \
         monodll_taskbarx11.o \
         monodll_animateg.o
  @COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS)
  COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS =  \
         monodll_taskbarcmn.o \
         monodll_taskbarx11.o \
         monodll_animateg.o
  @COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS)
  COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS =  \
         monodll_taskbarcmn.o \
-       monodll_animateg.o \
-       monodll_aboutdlg.o \
-       monodll_notifmsg.o \
-       monodll_sound.o \
-       monodll_taskbar.o \
-       monodll_joystick.o
+       monodll_msw_aboutdlg.o \
+       monodll_msw_notifmsg.o \
+       monodll_msw_sound.o \
+       monodll_msw_taskbar.o \
+       monodll_msw_joystick.o
  @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS)
  COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS =  \
         monodll_taskbarcmn.o \
         monodll_animateg.o \
  @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS)
  COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS =  \
         monodll_taskbarcmn.o \
         monodll_animateg.o \
-       monodll_aboutdlg.o \
-       monodll_drawer.o \
-       monodll_dataview.o \
-       monodll_databrow.o \
-       monodll_sound.o \
-       monodll_taskbar.o \
+       monodll_carbon_aboutdlg.o \
+       monodll_carbon_drawer.o \
+       monodll_dataview_osx.o \
+       monodll_carbon_dataview.o \
+       monodll_sound_osx.o \
+       monodll_carbon_sound.o \
+       monodll_carbon_taskbar.o \
         monodll_hidjoystick.o
  @COND_TOOLKIT_OSX_CARBON@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS)
  COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS =  \
         monodll_taskbarcmn.o \
         monodll_animateg.o \
         monodll_hidjoystick.o
  @COND_TOOLKIT_OSX_CARBON@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS)
  COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS =  \
         monodll_taskbarcmn.o \
         monodll_animateg.o \
-       monodll_aboutdlg.o \
-       monodll_taskbar.o \
+       monodll_sound_osx.o \
+       monodll_carbon_sound.o \
+       monodll_core_sound.o \
+       monodll_cocoa_aboutdlg.o \
+       monodll_dataview_osx.o \
+       monodll_cocoa_dataview.o \
+       monodll_osx_cocoa_taskbar.o \
         monodll_hidjoystick.o
  @COND_TOOLKIT_OSX_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS)
         monodll_hidjoystick.o
  @COND_TOOLKIT_OSX_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS)
+@COND_TOOLKIT_OSX_IPHONE@__ADVANCED_PLATFORM_SRC_OBJECTS \
+@COND_TOOLKIT_OSX_IPHONE@      = monodll_animateg.o monodll_sound_osx.o \
+@COND_TOOLKIT_OSX_IPHONE@      monodll_core_sound.o
  @COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS = \
  @COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS = \
-@COND_TOOLKIT_PM@      monodll_animateg.o monodll_joystick.o monodll_sound.o
+@COND_TOOLKIT_PM@      monodll_animateg.o monodll_os2_joystick.o \
+@COND_TOOLKIT_PM@      monodll_os2_sound.o
  COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS =  \
         monodll_taskbarcmn.o \
  COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS =  \
         monodll_taskbarcmn.o \
-       monodll_animateg.o \
-       monodll_aboutdlg.o \
-       monodll_notifmsg.o \
-       monodll_sound.o \
-       monodll_taskbar.o
+       monodll_msw_aboutdlg.o \
+       monodll_msw_notifmsg.o \
+       monodll_msw_sound.o \
+       monodll_msw_taskbar.o
  @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS)
  COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS =  \
         monodll_taskbarcmn.o \
  @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS)
  COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS =  \
         monodll_taskbarcmn.o \
-       monodll_joystick.o \
-       monodll_sound.o \
+       monodll_unix_joystick.o \
+       monodll_unix_sound.o \
         monodll_taskbarx11.o
  @COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS)
  @COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS_0 = monolib_apptraits.o
  @COND_PLATFORM_UNIX_1@__PLATFORM_SRC_OBJECTS_0 = monolib_apptraits.o
         monodll_taskbarx11.o
  @COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS)
  @COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS_0 = monolib_apptraits.o
  @COND_PLATFORM_UNIX_1@__PLATFORM_SRC_OBJECTS_0 = monolib_apptraits.o
-COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_0 =  \
-       monolib_colordlgosx.o \
-       monolib_fontdlgosx.o \
-       monolib_clipbrd.o \
-       monolib_cursor.o \
-       monolib_fontdlg.o \
-       monolib_gdiobj.o \
-       monolib_icon.o \
-       monolib_app.o \
-       monolib_combobox.o \
-       monolib_control.o \
-       monolib_dataobj.o \
-       monolib_dcclient.o \
-       monolib_dcprint.o \
-       monolib_dcscreen.o \
-       monolib_graphics.o \
-       monolib_dnd.o \
-       monolib_font.o \
-       monolib_frame.o \
-       monolib_metafile.o \
-       monolib_overlay.o \
-       monolib_popupwin.o \
-       monolib_printdlg.o \
-       monolib_renderer.o \
-       monolib_settings.o \
-       monolib_statbrma.o \
-       monolib_tabctrl.o \
-       monolib_tooltip.o \
-       monolib_utilscocoa.o
-@COND_PLATFORM_MACOSX_1@__OSX_CARBON_COCOA_SRC_OBJECTS_0 = $(COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_0)
-COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_17 =  \
-       monolib_accel.o \
-       monolib_artmac.o \
+COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_12 =  \
+       monolib_anybutton_osx.o \
         monolib_bmpbuttn_osx.o \
         monolib_bmpbuttn_osx.o \
-       monolib_brush.o \
         monolib_button_osx.o \
         monolib_checkbox_osx.o \
         monolib_checklst_osx.o \
         monolib_choice_osx.o \
         monolib_button_osx.o \
         monolib_checkbox_osx.o \
         monolib_checklst_osx.o \
         monolib_choice_osx.o \
-       monolib_dialog_osx.o \
-       monolib_fontutil.o \
+       monolib_combobox_osx.o \
+       monolib_dnd_osx.o \
         monolib_gauge_osx.o \
         monolib_gauge_osx.o \
-       monolib_imaglist.o \
         monolib_listbox_osx.o \
         monolib_menu_osx.o \
         monolib_menuitem_osx.o \
         monolib_listbox_osx.o \
         monolib_menu_osx.o \
         monolib_menuitem_osx.o \
-       monolib_minifram.o \
-       monolib_nonownedwnd_osx.o \
         monolib_notebook_osx.o \
         monolib_notebook_osx.o \
-       monolib_palette.o \
-       monolib_pen.o \
+       monolib_printdlg_osx.o \
         monolib_radiobox_osx.o \
         monolib_radiobut_osx.o \
         monolib_scrolbar_osx.o \
         monolib_radiobox_osx.o \
         monolib_radiobut_osx.o \
         monolib_scrolbar_osx.o \
@@ -11835,156 +13361,182 @@ COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_17 =  \
         monolib_statbox_osx.o \
         monolib_statline_osx.o \
         monolib_stattext_osx.o \
         monolib_statbox_osx.o \
         monolib_statline_osx.o \
         monolib_stattext_osx.o \
-       monolib_tabctrl_osx.o \
+       monolib_textentry_osx.o \
         monolib_textctrl_osx.o \
         monolib_tglbtn_osx.o \
         monolib_toolbar_osx.o \
         monolib_textctrl_osx.o \
         monolib_tglbtn_osx.o \
         monolib_toolbar_osx.o \
+       monolib_webkit.o \
+       monolib_colordlgosx.o \
+       monolib_fontdlgosx.o \
+       monolib_osx_accel.o \
+       monolib_carbon_clipbrd.o \
+       monolib_carbon_cursor.o \
+       monolib_carbon_fontdlg.o \
+       monolib_carbon_gdiobj.o \
+       monolib_carbon_icon.o \
+       monolib_carbon_app.o \
+       monolib_carbon_combobox.o \
+       monolib_carbon_control.o \
+       monolib_carbon_dataobj.o \
+       monolib_carbon_dcclient.o \
+       monolib_carbon_dcprint.o \
+       monolib_carbon_dcscreen.o \
+       monolib_glgrab.o \
+       monolib_carbon_graphics.o \
+       monolib_carbon_font.o \
+       monolib_carbon_frame.o \
+       monolib_carbon_mdi.o \
+       monolib_carbon_metafile.o \
+       monolib_carbon_overlay.o \
+       monolib_carbon_popupwin.o \
+       monolib_carbon_renderer.o \
+       monolib_carbon_settings.o \
+       monolib_statbrma.o \
+       monolib_carbon_region.o \
+       monolib_utilscocoa.o \
+       monolib_generic_caret.o \
+       monolib_clrpickerg.o \
+       monolib_collpaneg.o \
+       monolib_colrdlgg.o \
+       monolib_dirdlgg.o \
+       monolib_generic_fdrepdlg.o \
+       monolib_filedlgg.o \
+       monolib_filepickerg.o \
+       monolib_fontdlgg.o \
+       monolib_fontpickerg.o \
+       monolib_generic_listctrl.o \
+       monolib_prntdlgg.o \
+       monolib_generic_statusbr.o
+@COND_PLATFORM_MACOSX_1@__OSX_CARBON_COCOA_SRC_OBJECTS_12 = $(COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_12)
+COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_27 =  \
+       monolib_artmac.o \
+       monolib_osx_brush.o \
+       monolib_dialog_osx.o \
+       monolib_osx_fontutil.o \
+       monolib_osx_imaglist.o \
+       monolib_osx_minifram.o \
+       monolib_nonownedwnd_osx.o \
+       monolib_osx_palette.o \
+       monolib_osx_pen.o \
         monolib_toplevel_osx.o \
         monolib_toplevel_osx.o \
+       monolib_uiaction_osx.o \
         monolib_utils_osx.o \
         monolib_window_osx.o \
         monolib_utils_osx.o \
         monolib_window_osx.o \
-       monolib_bitmap.o \
-       monolib_colour.o \
-       monolib_dcmemory.o \
-       monolib_display.o \
-       monolib_fontenum.o \
+       monolib_core_bitmap.o \
+       monolib_core_colour.o \
+       monolib_core_dcmemory.o \
+       monolib_core_display.o \
+       monolib_core_fontenum.o \
         monolib_hid.o \
         monolib_printmac.o \
         monolib_hid.o \
         monolib_printmac.o \
-       monolib_timer.o \
+       monolib_core_timer.o \
         monolib_utilsexc_cf.o
         monolib_utilsexc_cf.o
-@COND_PLATFORM_MACOSX_1@__OSX_LOWLEVEL_SRC_OBJECTS_17 = $(COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_17)
+@COND_PLATFORM_MACOSX_1@__OSX_LOWLEVEL_SRC_OBJECTS_27 = $(COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_27)
  COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
         monolib_taskbarcmn.o \
  COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
         monolib_taskbarcmn.o \
-       monolib_joystick.o \
-       monolib_sound.o \
+       monolib_unix_joystick.o \
+       monolib_unix_sound.o \
         monolib_taskbarx11.o
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS_0)
  COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
         monolib_taskbarx11.o
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS_0)
  COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
-       monolib_taskbar.o \
+       monolib_src_cocoa_taskbar.o \
         monolib_taskbarcmn.o \
         monolib_animateg.o \
         monolib_hidjoystick.o
  @COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_0)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
         monolib_taskbarcmn.o \
         monolib_taskbarcmn.o \
         monolib_animateg.o \
         monolib_hidjoystick.o
  @COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_0)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
         monolib_taskbarcmn.o \
-       monolib_joystick.o \
-       monolib_sound.o \
+       monolib_unix_joystick.o \
+       monolib_unix_sound.o \
         monolib_taskbarx11.o \
         monolib_animateg.o \
         monolib_taskbarx11.o \
         monolib_animateg.o \
-       monolib_eggtrayicon.o \
-       monolib_taskbar.o
+       monolib_gtk1_eggtrayicon.o \
+       monolib_gtk1_taskbar.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_0)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
         monolib_taskbarcmn.o \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_0)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
         monolib_taskbarcmn.o \
-       monolib_joystick.o \
-       monolib_sound.o \
+       monolib_unix_joystick.o \
+       monolib_unix_sound.o \
         monolib_taskbarx11.o \
         monolib_taskbarx11.o \
-       monolib_taskbar.o \
-       monolib_eggtrayicon.o \
-       monolib_notifmsg.o
+       monolib_gtk_taskbar.o \
+       monolib_gtk_eggtrayicon.o \
+       monolib_hildon_notifmsg.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_0)
  COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
         monolib_taskbarcmn.o \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_0)
  COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
         monolib_taskbarcmn.o \
-       monolib_joystick.o \
-       monolib_sound.o \
+       monolib_unix_joystick.o \
+       monolib_unix_sound.o \
         monolib_taskbarx11.o \
         monolib_animateg.o
  @COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_0)
  COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
         monolib_taskbarcmn.o \
         monolib_taskbarx11.o \
         monolib_animateg.o
  @COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_0)
  COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
         monolib_taskbarcmn.o \
-       monolib_animateg.o \
-       monolib_aboutdlg.o \
-       monolib_notifmsg.o \
-       monolib_sound.o \
-       monolib_taskbar.o \
-       monolib_joystick.o
+       monolib_msw_aboutdlg.o \
+       monolib_msw_notifmsg.o \
+       monolib_msw_sound.o \
+       monolib_msw_taskbar.o \
+       monolib_msw_joystick.o
  @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_0)
  COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
         monolib_taskbarcmn.o \
         monolib_animateg.o \
  @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_0)
  COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
         monolib_taskbarcmn.o \
         monolib_animateg.o \
-       monolib_aboutdlg.o \
-       monolib_drawer.o \
-       monolib_dataview.o \
-       monolib_databrow.o \
-       monolib_sound.o \
-       monolib_taskbar.o \
+       monolib_carbon_aboutdlg.o \
+       monolib_carbon_drawer.o \
+       monolib_dataview_osx.o \
+       monolib_carbon_dataview.o \
+       monolib_sound_osx.o \
+       monolib_carbon_sound.o \
+       monolib_carbon_taskbar.o \
         monolib_hidjoystick.o
  @COND_TOOLKIT_OSX_CARBON@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS_0)
  COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
         monolib_taskbarcmn.o \
         monolib_animateg.o \
         monolib_hidjoystick.o
  @COND_TOOLKIT_OSX_CARBON@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS_0)
  COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
         monolib_taskbarcmn.o \
         monolib_animateg.o \
-       monolib_aboutdlg.o \
-       monolib_taskbar.o \
+       monolib_sound_osx.o \
+       monolib_carbon_sound.o \
+       monolib_core_sound.o \
+       monolib_cocoa_aboutdlg.o \
+       monolib_dataview_osx.o \
+       monolib_cocoa_dataview.o \
+       monolib_osx_cocoa_taskbar.o \
         monolib_hidjoystick.o
  @COND_TOOLKIT_OSX_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_0)
         monolib_hidjoystick.o
  @COND_TOOLKIT_OSX_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_0)
+@COND_TOOLKIT_OSX_IPHONE@__ADVANCED_PLATFORM_SRC_OBJECTS_0 \
+@COND_TOOLKIT_OSX_IPHONE@      = monolib_animateg.o monolib_sound_osx.o \
+@COND_TOOLKIT_OSX_IPHONE@      monolib_core_sound.o
  @COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
  @COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
-@COND_TOOLKIT_PM@      monolib_animateg.o monolib_joystick.o monolib_sound.o
+@COND_TOOLKIT_PM@      monolib_animateg.o monolib_os2_joystick.o \
+@COND_TOOLKIT_PM@      monolib_os2_sound.o
  COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
         monolib_taskbarcmn.o \
  COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
         monolib_taskbarcmn.o \
-       monolib_animateg.o \
-       monolib_aboutdlg.o \
-       monolib_notifmsg.o \
-       monolib_sound.o \
-       monolib_taskbar.o
+       monolib_msw_aboutdlg.o \
+       monolib_msw_notifmsg.o \
+       monolib_msw_sound.o \
+       monolib_msw_taskbar.o
  @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_0)
  COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
         monolib_taskbarcmn.o \
  @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_0)
  COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
         monolib_taskbarcmn.o \
-       monolib_joystick.o \
-       monolib_sound.o \
+       monolib_unix_joystick.o \
+       monolib_unix_sound.o \
         monolib_taskbarx11.o
  @COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_0)
  @COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS_8 = coredll_apptraits.o
  @COND_PLATFORM_UNIX_1@__PLATFORM_SRC_OBJECTS_8 = coredll_apptraits.o
         monolib_taskbarx11.o
  @COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_0)
  @COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS_8 = coredll_apptraits.o
  @COND_PLATFORM_UNIX_1@__PLATFORM_SRC_OBJECTS_8 = coredll_apptraits.o
-COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_8 =  \
-       coredll_colordlgosx.o \
-       coredll_fontdlgosx.o \
-       coredll_clipbrd.o \
-       coredll_cursor.o \
-       coredll_fontdlg.o \
-       coredll_gdiobj.o \
-       coredll_icon.o \
-       coredll_app.o \
-       coredll_combobox.o \
-       coredll_control.o \
-       coredll_dataobj.o \
-       coredll_dcclient.o \
-       coredll_dcprint.o \
-       coredll_dcscreen.o \
-       coredll_graphics.o \
-       coredll_dnd.o \
-       coredll_font.o \
-       coredll_frame.o \
-       coredll_metafile.o \
-       coredll_overlay.o \
-       coredll_popupwin.o \
-       coredll_printdlg.o \
-       coredll_renderer.o \
-       coredll_settings.o \
-       coredll_statbrma.o \
-       coredll_tabctrl.o \
-       coredll_tooltip.o \
-       coredll_utilscocoa.o
-@COND_PLATFORM_MACOSX_1@__OSX_CARBON_COCOA_SRC_OBJECTS_8 = $(COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_8)
-COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_1_1 =  \
-       coredll_accel.o \
-       coredll_artmac.o \
+COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_14 =  \
+       coredll_anybutton_osx.o \
         coredll_bmpbuttn_osx.o \
         coredll_bmpbuttn_osx.o \
-       coredll_brush.o \
         coredll_button_osx.o \
         coredll_checkbox_osx.o \
         coredll_checklst_osx.o \
         coredll_choice_osx.o \
         coredll_button_osx.o \
         coredll_checkbox_osx.o \
         coredll_checklst_osx.o \
         coredll_choice_osx.o \
-       coredll_dialog_osx.o \
-       coredll_fontutil.o \
+       coredll_combobox_osx.o \
+       coredll_dnd_osx.o \
         coredll_gauge_osx.o \
         coredll_gauge_osx.o \
-       coredll_imaglist.o \
         coredll_listbox_osx.o \
         coredll_menu_osx.o \
         coredll_menuitem_osx.o \
         coredll_listbox_osx.o \
         coredll_menu_osx.o \
         coredll_menuitem_osx.o \
-       coredll_minifram.o \
-       coredll_nonownedwnd_osx.o \
         coredll_notebook_osx.o \
         coredll_notebook_osx.o \
-       coredll_palette.o \
-       coredll_pen.o \
+       coredll_printdlg_osx.o \
         coredll_radiobox_osx.o \
         coredll_radiobut_osx.o \
         coredll_scrolbar_osx.o \
         coredll_radiobox_osx.o \
         coredll_radiobut_osx.o \
         coredll_scrolbar_osx.o \
@@ -11995,76 +13547,94 @@ COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_1_1 =  \
         coredll_statbox_osx.o \
         coredll_statline_osx.o \
         coredll_stattext_osx.o \
         coredll_statbox_osx.o \
         coredll_statline_osx.o \
         coredll_stattext_osx.o \
-       coredll_tabctrl_osx.o \
+       coredll_textentry_osx.o \
         coredll_textctrl_osx.o \
         coredll_tglbtn_osx.o \
         coredll_toolbar_osx.o \
         coredll_textctrl_osx.o \
         coredll_tglbtn_osx.o \
         coredll_toolbar_osx.o \
+       coredll_webkit.o \
+       coredll_colordlgosx.o \
+       coredll_fontdlgosx.o \
+       coredll_osx_accel.o \
+       coredll_carbon_clipbrd.o \
+       coredll_carbon_cursor.o \
+       coredll_carbon_fontdlg.o \
+       coredll_carbon_gdiobj.o \
+       coredll_carbon_icon.o \
+       coredll_carbon_app.o \
+       coredll_carbon_combobox.o \
+       coredll_carbon_control.o \
+       coredll_carbon_dataobj.o \
+       coredll_carbon_dcclient.o \
+       coredll_carbon_dcprint.o \
+       coredll_carbon_dcscreen.o \
+       coredll_glgrab.o \
+       coredll_carbon_graphics.o \
+       coredll_carbon_font.o \
+       coredll_carbon_frame.o \
+       coredll_carbon_mdi.o \
+       coredll_carbon_metafile.o \
+       coredll_carbon_overlay.o \
+       coredll_carbon_popupwin.o \
+       coredll_carbon_renderer.o \
+       coredll_carbon_settings.o \
+       coredll_statbrma.o \
+       coredll_carbon_region.o \
+       coredll_utilscocoa.o \
+       coredll_generic_caret.o \
+       coredll_clrpickerg.o \
+       coredll_collpaneg.o \
+       coredll_colrdlgg.o \
+       coredll_dirdlgg.o \
+       coredll_generic_fdrepdlg.o \
+       coredll_filedlgg.o \
+       coredll_filepickerg.o \
+       coredll_fontdlgg.o \
+       coredll_fontpickerg.o \
+       coredll_generic_listctrl.o \
+       coredll_prntdlgg.o \
+       coredll_generic_statusbr.o
+@COND_PLATFORM_MACOSX_1@__OSX_CARBON_COCOA_SRC_OBJECTS_14 = $(COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_14)
+COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_1_4 =  \
+       coredll_artmac.o \
+       coredll_osx_brush.o \
+       coredll_dialog_osx.o \
+       coredll_osx_fontutil.o \
+       coredll_osx_imaglist.o \
+       coredll_osx_minifram.o \
+       coredll_nonownedwnd_osx.o \
+       coredll_osx_palette.o \
+       coredll_osx_pen.o \
         coredll_toplevel_osx.o \
         coredll_toplevel_osx.o \
+       coredll_uiaction_osx.o \
         coredll_utils_osx.o \
         coredll_window_osx.o \
         coredll_utils_osx.o \
         coredll_window_osx.o \
-       coredll_bitmap.o \
-       coredll_colour.o \
-       coredll_dcmemory.o \
-       coredll_display.o \
-       coredll_fontenum.o \
+       coredll_core_bitmap.o \
+       coredll_core_colour.o \
+       coredll_core_dcmemory.o \
+       coredll_core_display.o \
+       coredll_core_fontenum.o \
         coredll_hid.o \
         coredll_printmac.o \
         coredll_hid.o \
         coredll_printmac.o \
-       coredll_timer.o \
+       coredll_core_timer.o \
         coredll_utilsexc_cf.o
         coredll_utilsexc_cf.o
-@COND_PLATFORM_MACOSX_1@__OSX_LOWLEVEL_SRC_OBJECTS_1_1 = $(COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_1_1)
+@COND_PLATFORM_MACOSX_1@__OSX_LOWLEVEL_SRC_OBJECTS_1_4 = $(COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_1_4)
  @COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS_9 = corelib_apptraits.o
  @COND_PLATFORM_UNIX_1@__PLATFORM_SRC_OBJECTS_9 = corelib_apptraits.o
  @COND_PLATFORM_MACOSX_1@__PLATFORM_SRC_OBJECTS_9 = corelib_apptraits.o
  @COND_PLATFORM_UNIX_1@__PLATFORM_SRC_OBJECTS_9 = corelib_apptraits.o
-COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_9 =  \
-       corelib_colordlgosx.o \
-       corelib_fontdlgosx.o \
-       corelib_clipbrd.o \
-       corelib_cursor.o \
-       corelib_fontdlg.o \
-       corelib_gdiobj.o \
-       corelib_icon.o \
-       corelib_app.o \
-       corelib_combobox.o \
-       corelib_control.o \
-       corelib_dataobj.o \
-       corelib_dcclient.o \
-       corelib_dcprint.o \
-       corelib_dcscreen.o \
-       corelib_graphics.o \
-       corelib_dnd.o \
-       corelib_font.o \
-       corelib_frame.o \
-       corelib_metafile.o \
-       corelib_overlay.o \
-       corelib_popupwin.o \
-       corelib_printdlg.o \
-       corelib_renderer.o \
-       corelib_settings.o \
-       corelib_statbrma.o \
-       corelib_tabctrl.o \
-       corelib_tooltip.o \
-       corelib_utilscocoa.o
-@COND_PLATFORM_MACOSX_1@__OSX_CARBON_COCOA_SRC_OBJECTS_9 = $(COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_9)
-COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_1_4 =  \
-       corelib_accel.o \
-       corelib_artmac.o \
+COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_1_0 =  \
+       corelib_anybutton_osx.o \
         corelib_bmpbuttn_osx.o \
         corelib_bmpbuttn_osx.o \
-       corelib_brush.o \
         corelib_button_osx.o \
         corelib_checkbox_osx.o \
         corelib_checklst_osx.o \
         corelib_choice_osx.o \
         corelib_button_osx.o \
         corelib_checkbox_osx.o \
         corelib_checklst_osx.o \
         corelib_choice_osx.o \
-       corelib_dialog_osx.o \
-       corelib_fontutil.o \
+       corelib_combobox_osx.o \
+       corelib_dnd_osx.o \
         corelib_gauge_osx.o \
         corelib_gauge_osx.o \
-       corelib_imaglist.o \
         corelib_listbox_osx.o \
         corelib_menu_osx.o \
         corelib_menuitem_osx.o \
         corelib_listbox_osx.o \
         corelib_menu_osx.o \
         corelib_menuitem_osx.o \
-       corelib_minifram.o \
-       corelib_nonownedwnd_osx.o \
         corelib_notebook_osx.o \
         corelib_notebook_osx.o \
-       corelib_palette.o \
-       corelib_pen.o \
+       corelib_printdlg_osx.o \
         corelib_radiobox_osx.o \
         corelib_radiobut_osx.o \
         corelib_scrolbar_osx.o \
         corelib_radiobox_osx.o \
         corelib_radiobut_osx.o \
         corelib_scrolbar_osx.o \
@@ -12075,171 +13645,253 @@ COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_1_4 =  \
         corelib_statbox_osx.o \
         corelib_statline_osx.o \
         corelib_stattext_osx.o \
         corelib_statbox_osx.o \
         corelib_statline_osx.o \
         corelib_stattext_osx.o \
-       corelib_tabctrl_osx.o \
+       corelib_textentry_osx.o \
         corelib_textctrl_osx.o \
         corelib_tglbtn_osx.o \
         corelib_toolbar_osx.o \
         corelib_textctrl_osx.o \
         corelib_tglbtn_osx.o \
         corelib_toolbar_osx.o \
+       corelib_webkit.o \
+       corelib_colordlgosx.o \
+       corelib_fontdlgosx.o \
+       corelib_osx_accel.o \
+       corelib_carbon_clipbrd.o \
+       corelib_carbon_cursor.o \
+       corelib_carbon_fontdlg.o \
+       corelib_carbon_gdiobj.o \
+       corelib_carbon_icon.o \
+       corelib_carbon_app.o \
+       corelib_carbon_combobox.o \
+       corelib_carbon_control.o \
+       corelib_carbon_dataobj.o \
+       corelib_carbon_dcclient.o \
+       corelib_carbon_dcprint.o \
+       corelib_carbon_dcscreen.o \
+       corelib_glgrab.o \
+       corelib_carbon_graphics.o \
+       corelib_carbon_font.o \
+       corelib_carbon_frame.o \
+       corelib_carbon_mdi.o \
+       corelib_carbon_metafile.o \
+       corelib_carbon_overlay.o \
+       corelib_carbon_popupwin.o \
+       corelib_carbon_renderer.o \
+       corelib_carbon_settings.o \
+       corelib_statbrma.o \
+       corelib_carbon_region.o \
+       corelib_utilscocoa.o \
+       corelib_generic_caret.o \
+       corelib_clrpickerg.o \
+       corelib_collpaneg.o \
+       corelib_colrdlgg.o \
+       corelib_dirdlgg.o \
+       corelib_generic_fdrepdlg.o \
+       corelib_filedlgg.o \
+       corelib_filepickerg.o \
+       corelib_fontdlgg.o \
+       corelib_fontpickerg.o \
+       corelib_generic_listctrl.o \
+       corelib_prntdlgg.o \
+       corelib_generic_statusbr.o
+@COND_PLATFORM_MACOSX_1@__OSX_CARBON_COCOA_SRC_OBJECTS_1_0 = $(COND_PLATFORM_MACOSX_1___OSX_CARBON_COCOA_SRC_OBJECTS_1_0)
+COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_2_2 =  \
+       corelib_artmac.o \
+       corelib_osx_brush.o \
+       corelib_dialog_osx.o \
+       corelib_osx_fontutil.o \
+       corelib_osx_imaglist.o \
+       corelib_osx_minifram.o \
+       corelib_nonownedwnd_osx.o \
+       corelib_osx_palette.o \
+       corelib_osx_pen.o \
         corelib_toplevel_osx.o \
         corelib_toplevel_osx.o \
+       corelib_uiaction_osx.o \
         corelib_utils_osx.o \
         corelib_window_osx.o \
         corelib_utils_osx.o \
         corelib_window_osx.o \
-       corelib_bitmap.o \
-       corelib_colour.o \
-       corelib_dcmemory.o \
-       corelib_display.o \
-       corelib_fontenum.o \
+       corelib_core_bitmap.o \
+       corelib_core_colour.o \
+       corelib_core_dcmemory.o \
+       corelib_core_display.o \
+       corelib_core_fontenum.o \
         corelib_hid.o \
         corelib_printmac.o \
         corelib_hid.o \
         corelib_printmac.o \
-       corelib_timer.o \
+       corelib_core_timer.o \
         corelib_utilsexc_cf.o
         corelib_utilsexc_cf.o
-@COND_PLATFORM_MACOSX_1@__OSX_LOWLEVEL_SRC_OBJECTS_1_4 = $(COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_1_4)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@__ADVANCED_PLATFORM_SRC_OBJECTS_8 \
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@     = advdll_taskbarcmn.o advdll_joystick.o \
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@     advdll_sound.o advdll_taskbarx11.o
+@COND_PLATFORM_MACOSX_1@__OSX_LOWLEVEL_SRC_OBJECTS_2_2 = $(COND_PLATFORM_MACOSX_1___OSX_LOWLEVEL_SRC_OBJECTS_2_2)
+COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
+       advdll_taskbarcmn.o \
+       advdll_unix_joystick.o \
+       advdll_unix_sound.o \
+       advdll_taskbarx11.o
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS_8)
  COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
  COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
-       advdll_taskbar.o \
+       advdll_src_cocoa_taskbar.o \
         advdll_taskbarcmn.o \
         advdll_animateg.o \
         advdll_hidjoystick.o
  @COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_8)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
         advdll_taskbarcmn.o \
         advdll_taskbarcmn.o \
         advdll_animateg.o \
         advdll_hidjoystick.o
  @COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_8)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
         advdll_taskbarcmn.o \
-       advdll_joystick.o \
-       advdll_sound.o \
+       advdll_unix_joystick.o \
+       advdll_unix_sound.o \
         advdll_taskbarx11.o \
         advdll_animateg.o \
         advdll_taskbarx11.o \
         advdll_animateg.o \
-       advdll_eggtrayicon.o \
-       advdll_taskbar.o
+       advdll_gtk1_eggtrayicon.o \
+       advdll_gtk1_taskbar.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_8)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
         advdll_taskbarcmn.o \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_8)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
         advdll_taskbarcmn.o \
-       advdll_joystick.o \
-       advdll_sound.o \
+       advdll_unix_joystick.o \
+       advdll_unix_sound.o \
         advdll_taskbarx11.o \
         advdll_taskbarx11.o \
-       advdll_taskbar.o \
-       advdll_eggtrayicon.o \
-       advdll_notifmsg.o
+       advdll_gtk_taskbar.o \
+       advdll_gtk_eggtrayicon.o \
+       advdll_hildon_notifmsg.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_8)
  COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
         advdll_taskbarcmn.o \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_8)
  COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
         advdll_taskbarcmn.o \
-       advdll_joystick.o \
-       advdll_sound.o \
+       advdll_unix_joystick.o \
+       advdll_unix_sound.o \
         advdll_taskbarx11.o \
         advdll_animateg.o
  @COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_8)
  COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
         advdll_taskbarcmn.o \
         advdll_taskbarx11.o \
         advdll_animateg.o
  @COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_8)
  COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
         advdll_taskbarcmn.o \
-       advdll_animateg.o \
-       advdll_aboutdlg.o \
-       advdll_notifmsg.o \
-       advdll_sound.o \
-       advdll_taskbar.o \
-       advdll_joystick.o
+       advdll_msw_aboutdlg.o \
+       advdll_msw_notifmsg.o \
+       advdll_msw_sound.o \
+       advdll_msw_taskbar.o \
+       advdll_msw_joystick.o
  @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_8)
  COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
         advdll_taskbarcmn.o \
         advdll_animateg.o \
  @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_8)
  COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
         advdll_taskbarcmn.o \
         advdll_animateg.o \
-       advdll_aboutdlg.o \
+       advdll_carbon_aboutdlg.o \
         advdll_drawer.o \
         advdll_drawer.o \
-       advdll_dataview.o \
-       advdll_databrow.o \
-       advdll_sound.o \
-       advdll_taskbar.o \
+       advdll_dataview_osx.o \
+       advdll_carbon_dataview.o \
+       advdll_sound_osx.o \
+       advdll_carbon_sound.o \
+       advdll_carbon_taskbar.o \
         advdll_hidjoystick.o
  @COND_TOOLKIT_OSX_CARBON@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS_8)
  COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
         advdll_taskbarcmn.o \
         advdll_animateg.o \
         advdll_hidjoystick.o
  @COND_TOOLKIT_OSX_CARBON@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS_8)
  COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
         advdll_taskbarcmn.o \
         advdll_animateg.o \
-       advdll_aboutdlg.o \
-       advdll_taskbar.o \
+       advdll_sound_osx.o \
+       advdll_carbon_sound.o \
+       advdll_core_sound.o \
+       advdll_cocoa_aboutdlg.o \
+       advdll_dataview_osx.o \
+       advdll_cocoa_dataview.o \
+       advdll_osx_cocoa_taskbar.o \
         advdll_hidjoystick.o
  @COND_TOOLKIT_OSX_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_8)
         advdll_hidjoystick.o
  @COND_TOOLKIT_OSX_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_8)
+@COND_TOOLKIT_OSX_IPHONE@__ADVANCED_PLATFORM_SRC_OBJECTS_8 \
+@COND_TOOLKIT_OSX_IPHONE@      = advdll_animateg.o advdll_sound_osx.o \
+@COND_TOOLKIT_OSX_IPHONE@      advdll_core_sound.o
  @COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
  @COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
-@COND_TOOLKIT_PM@      advdll_animateg.o advdll_joystick.o advdll_sound.o
+@COND_TOOLKIT_PM@      advdll_animateg.o advdll_os2_joystick.o \
+@COND_TOOLKIT_PM@      advdll_os2_sound.o
  COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
         advdll_taskbarcmn.o \
  COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
         advdll_taskbarcmn.o \
-       advdll_animateg.o \
-       advdll_aboutdlg.o \
-       advdll_notifmsg.o \
-       advdll_sound.o \
-       advdll_taskbar.o
+       advdll_msw_aboutdlg.o \
+       advdll_msw_notifmsg.o \
+       advdll_msw_sound.o \
+       advdll_msw_taskbar.o
  @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_8)
  @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_8)
-@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
-@COND_TOOLKIT_X11@     advdll_taskbarcmn.o advdll_joystick.o advdll_sound.o \
-@COND_TOOLKIT_X11@     advdll_taskbarx11.o
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@__ADVANCED_PLATFORM_SRC_OBJECTS_9 \
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@     = advlib_taskbarcmn.o advlib_joystick.o \
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@     advlib_sound.o advlib_taskbarx11.o
+COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
+       advdll_taskbarcmn.o \
+       advdll_unix_joystick.o \
+       advdll_unix_sound.o \
+       advdll_taskbarx11.o
+@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_8)
+COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
+       advlib_taskbarcmn.o \
+       advlib_unix_joystick.o \
+       advlib_unix_sound.o \
+       advlib_taskbarx11.o
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS_9)
  COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
  COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
-       advlib_taskbar.o \
+       advlib_src_cocoa_taskbar.o \
         advlib_taskbarcmn.o \
         advlib_animateg.o \
         advlib_hidjoystick.o
  @COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_9)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
         advlib_taskbarcmn.o \
         advlib_taskbarcmn.o \
         advlib_animateg.o \
         advlib_hidjoystick.o
  @COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_9)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
         advlib_taskbarcmn.o \
-       advlib_joystick.o \
-       advlib_sound.o \
+       advlib_unix_joystick.o \
+       advlib_unix_sound.o \
         advlib_taskbarx11.o \
         advlib_animateg.o \
         advlib_taskbarx11.o \
         advlib_animateg.o \
-       advlib_eggtrayicon.o \
-       advlib_taskbar.o
+       advlib_gtk1_eggtrayicon.o \
+       advlib_gtk1_taskbar.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_9)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
         advlib_taskbarcmn.o \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_9)
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
         advlib_taskbarcmn.o \
-       advlib_joystick.o \
-       advlib_sound.o \
+       advlib_unix_joystick.o \
+       advlib_unix_sound.o \
         advlib_taskbarx11.o \
         advlib_taskbarx11.o \
-       advlib_taskbar.o \
-       advlib_eggtrayicon.o \
-       advlib_notifmsg.o
+       advlib_gtk_taskbar.o \
+       advlib_gtk_eggtrayicon.o \
+       advlib_hildon_notifmsg.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_9)
  COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
         advlib_taskbarcmn.o \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_9)
  COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
         advlib_taskbarcmn.o \
-       advlib_joystick.o \
-       advlib_sound.o \
+       advlib_unix_joystick.o \
+       advlib_unix_sound.o \
         advlib_taskbarx11.o \
         advlib_animateg.o
  @COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_9)
  COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
         advlib_taskbarcmn.o \
         advlib_taskbarx11.o \
         advlib_animateg.o
  @COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_9)
  COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
         advlib_taskbarcmn.o \
-       advlib_animateg.o \
-       advlib_aboutdlg.o \
-       advlib_notifmsg.o \
-       advlib_sound.o \
-       advlib_taskbar.o \
-       advlib_joystick.o
+       advlib_msw_aboutdlg.o \
+       advlib_msw_notifmsg.o \
+       advlib_msw_sound.o \
+       advlib_msw_taskbar.o \
+       advlib_msw_joystick.o
  @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_9)
  COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
         advlib_taskbarcmn.o \
         advlib_animateg.o \
  @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_9)
  COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
         advlib_taskbarcmn.o \
         advlib_animateg.o \
-       advlib_aboutdlg.o \
+       advlib_carbon_aboutdlg.o \
         advlib_drawer.o \
         advlib_drawer.o \
-       advlib_dataview.o \
-       advlib_databrow.o \
-       advlib_sound.o \
-       advlib_taskbar.o \
+       advlib_dataview_osx.o \
+       advlib_carbon_dataview.o \
+       advlib_sound_osx.o \
+       advlib_carbon_sound.o \
+       advlib_carbon_taskbar.o \
         advlib_hidjoystick.o
  @COND_TOOLKIT_OSX_CARBON@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS_9)
  COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
         advlib_taskbarcmn.o \
         advlib_animateg.o \
         advlib_hidjoystick.o
  @COND_TOOLKIT_OSX_CARBON@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS_9)
  COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
         advlib_taskbarcmn.o \
         advlib_animateg.o \
-       advlib_aboutdlg.o \
-       advlib_taskbar.o \
+       advlib_sound_osx.o \
+       advlib_carbon_sound.o \
+       advlib_core_sound.o \
+       advlib_cocoa_aboutdlg.o \
+       advlib_dataview_osx.o \
+       advlib_cocoa_dataview.o \
+       advlib_osx_cocoa_taskbar.o \
         advlib_hidjoystick.o
  @COND_TOOLKIT_OSX_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_9)
         advlib_hidjoystick.o
  @COND_TOOLKIT_OSX_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_9)
+@COND_TOOLKIT_OSX_IPHONE@__ADVANCED_PLATFORM_SRC_OBJECTS_9 \
+@COND_TOOLKIT_OSX_IPHONE@      = advlib_animateg.o advlib_sound_osx.o \
+@COND_TOOLKIT_OSX_IPHONE@      advlib_core_sound.o
  @COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
  @COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
-@COND_TOOLKIT_PM@      advlib_animateg.o advlib_joystick.o advlib_sound.o
+@COND_TOOLKIT_PM@      advlib_animateg.o advlib_os2_joystick.o \
+@COND_TOOLKIT_PM@      advlib_os2_sound.o
  COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
         advlib_taskbarcmn.o \
  COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
         advlib_taskbarcmn.o \
-       advlib_animateg.o \
-       advlib_aboutdlg.o \
-       advlib_notifmsg.o \
-       advlib_sound.o \
-       advlib_taskbar.o
+       advlib_msw_aboutdlg.o \
+       advlib_msw_notifmsg.o \
+       advlib_msw_sound.o \
+       advlib_msw_taskbar.o
  @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_9)
  @COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_9)
-@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
-@COND_TOOLKIT_X11@     advlib_taskbarcmn.o advlib_joystick.o advlib_sound.o \
-@COND_TOOLKIT_X11@     advlib_taskbarx11.o
+COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
+       advlib_taskbarcmn.o \
+       advlib_unix_joystick.o \
+       advlib_unix_sound.o \
+       advlib_taskbarx11.o
+@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_9)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__htmldll_library_link_DEP \
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      = $(__htmldll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__htmldll_library_link_LIBR \
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__htmldll_library_link_DEP \
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      = $(__htmldll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__htmldll_library_link_LIBR \
@@ -12248,75 +13900,79 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0 \
         = \
         -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__htmldll_library_link_LIBR_0 = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0)
         = \
         -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__htmldll_library_link_LIBR_0 = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_54 = --define __WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_53 = --define wxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_53 = --define wxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_53 = --define wxNO_THREADS
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .0.$(SO_SUFFIX)
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p_67 = --define __WXUNIVERSAL__
+@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_66 = --define wxDEBUG_LEVEL=0
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_65 = --define wxNO_EXCEPTIONS
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_65 = --define wxNO_RTTI
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_65 = --define wxNO_THREADS
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).3
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .3.$(SO_SUFFIX)
  @COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX)
  @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@dll___targetsuf3 \
  @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@     = \
  @COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX)
  @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@dll___targetsuf3 \
  @COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@     = \
-@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@     .$(SO_SUFFIX).0.0.0
+@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@     .$(SO_SUFFIX).3.0.0
  @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf3 \
  @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@       = .0.0.0.$(SO_SUFFIX)
-@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -0.$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@       = .3.0.0.$(SO_SUFFIX)
+@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -3.$(SO_SUFFIX)
  @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
  @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).3
  @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  @COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
  @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  @COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_BUILD_p_54 \
-@COND_WXUSE_LIBTIFF_BUILTIN@   = --include-dir \
-@COND_WXUSE_LIBTIFF_BUILTIN@   $(wx_top_builddir)/src/tiff/libtiff
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_54 = \
-@COND_WXUSE_LIBTIFF_BUILTIN@   --include-dir $(top_srcdir)/src/tiff/libtiff
-@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_54 = \
-@COND_WXUSE_LIBJPEG_BUILTIN@   --include-dir $(top_srcdir)/src/jpeg
-@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_53 = \
-@COND_WXUSE_LIBPNG_BUILTIN@    --include-dir $(top_srcdir)/src/png
-@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_55 = \
-@COND_WXUSE_ZLIB_BUILTIN@      --include-dir $(top_srcdir)/src/zlib
-@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_53 = \
-@COND_WXUSE_REGEX_BUILTIN@     --include-dir $(top_srcdir)/src/regex
-@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p_53 = \
-@COND_WXUSE_EXPAT_BUILTIN@     --include-dir $(top_srcdir)/src/expat/lib
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
+@COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_BUILD_p_66 \
+@COND_wxUSE_LIBTIFF_builtin@   = --include-dir \
+@COND_wxUSE_LIBTIFF_builtin@   $(wx_top_builddir)/src/tiff/libtiff
+@COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_p_66 = \
+@COND_wxUSE_LIBTIFF_builtin@   --include-dir $(top_srcdir)/src/tiff/libtiff
+@COND_wxUSE_LIBJPEG_builtin@__INC_JPEG_p_66 = \
+@COND_wxUSE_LIBJPEG_builtin@   --include-dir $(top_srcdir)/src/jpeg
+@COND_wxUSE_LIBPNG_builtin@__INC_PNG_p_65 = \
+@COND_wxUSE_LIBPNG_builtin@    --include-dir $(top_srcdir)/src/png
+@COND_wxUSE_ZLIB_builtin@__INC_ZLIB_p_67 = \
+@COND_wxUSE_ZLIB_builtin@      --include-dir $(top_srcdir)/src/zlib
+@COND_wxUSE_REGEX_builtin@__INC_REGEX_p_65 = \
+@COND_wxUSE_REGEX_builtin@     --include-dir $(top_srcdir)/src/regex
+@COND_wxUSE_EXPAT_builtin@__INC_EXPAT_p_65 = \
+@COND_wxUSE_EXPAT_builtin@     --include-dir $(top_srcdir)/src/expat/lib
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@  = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@  -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@      -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
         -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
         -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@     -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
  @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
  @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
  @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
  @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
  @COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
  @COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
  @COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_BUILD_p \
-@COND_WXUSE_LIBTIFF_BUILTIN@   = -I$(wx_top_builddir)/src/tiff/libtiff
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff/libtiff
-@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg
-@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png
-@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib
-@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex
-@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p = -I$(top_srcdir)/src/expat/lib
+@COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_BUILD_p \
+@COND_wxUSE_LIBTIFF_builtin@   = -I$(wx_top_builddir)/src/tiff/libtiff
+@COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_p = -I$(top_srcdir)/src/tiff/libtiff
+@COND_wxUSE_LIBJPEG_builtin@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg
+@COND_wxUSE_LIBPNG_builtin@__INC_PNG_p = -I$(top_srcdir)/src/png
+@COND_wxUSE_ZLIB_builtin@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib
+@COND_wxUSE_REGEX_builtin@__INC_REGEX_p = -I$(top_srcdir)/src/regex
+@COND_wxUSE_EXPAT_builtin@__INC_EXPAT_p = -I$(top_srcdir)/src/expat/lib
  
  ### Targets: ###
  
  
  ### Targets: ###
  
-all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___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) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
+all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___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) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
  
  
-install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___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_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
+install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___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_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
         $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
         (cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
         $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
         $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
         (cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
         $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
-       (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)
+       (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets)
+       $(DYLIB_RPATH_INSTALL)
         $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
         for f in setup.h $(RCDEFS_H); do \
         if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
         $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
         for f in setup.h $(RCDEFS_H); do \
         if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
@@ -12342,14 +13998,14 @@ install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__in
         @echo " wxWidgets comes with no guarantees and doesn't claim"
         @echo " to be suitable for any purpose."
         @echo " "
         @echo " wxWidgets comes with no guarantees and doesn't claim"
         @echo " to be suitable for any purpose."
         @echo " "
-       @echo " Read the wxWidgets Licence on licencing conditions."
+       @echo " Read the wxWindows Licence on licencing conditions."
         @echo " "
         @echo " ------------------------------------------------------"
         @echo " "
  
         @echo " "
         @echo " ------------------------------------------------------"
         @echo " "
  
-uninstall: $(__uninstall_wxregex___depname) $(__uninstall_wxzlib___depname) $(__uninstall_wxpng___depname) $(__uninstall_wxjpeg___depname) $(__uninstall_wxtiff___depname) $(__uninstall_wxexpat___depname) $(__uninstall_wxscintilla___depname) $(__uninstall_monodll___depname) $(__uninstall_monolib___depname) $(__uninstall_basedll___depname) $(__uninstall_baselib___depname) $(__uninstall_netdll___depname) $(__uninstall_netlib___depname) $(__uninstall_coredll___depname) $(__uninstall_corelib___depname) $(__uninstall_advdll___depname) $(__uninstall_advlib___depname) $(__uninstall_mediadll___depname) $(__uninstall_medialib___depname) $(__uninstall_htmldll___depname) $(__uninstall_htmllib___depname) $(__uninstall_qadll___depname) $(__uninstall_qalib___depname) $(__uninstall_xmldll___depname) $(__uninstall_xmllib___depname) $(__uninstall_xrcdll___depname) $(__uninstall_xrclib___depname) $(__uninstall_auidll___depname) $(__uninstall_auilib___depname) $(__uninstall_richtextdll___depname) $(__uninstall_richtextlib___depname) $(__uninstall_stcdll___depname) $(__uninstall_stclib___depname) $(__uninstall_gldll___depname) $(__uninstall_gllib___depname) $(__uninstall_sound_sdl___depname) locale_uninstall locale_msw_uninstall
+uninstall: $(__uninstall_wxregex___depname) $(__uninstall_wxzlib___depname) $(__uninstall_wxpng___depname) $(__uninstall_wxjpeg___depname) $(__uninstall_wxtiff___depname) $(__uninstall_wxexpat___depname) $(__uninstall_wxscintilla___depname) $(__uninstall_monodll___depname) $(__uninstall_monolib___depname) $(__uninstall_basedll___depname) $(__uninstall_baselib___depname) $(__uninstall_netdll___depname) $(__uninstall_netlib___depname) $(__uninstall_coredll___depname) $(__uninstall_corelib___depname) $(__uninstall_advdll___depname) $(__uninstall_advlib___depname) $(__uninstall_mediadll___depname) $(__uninstall_medialib___depname) $(__uninstall_htmldll___depname) $(__uninstall_htmllib___depname) $(__uninstall_webviewdll___depname) $(__uninstall_webviewlib___depname) $(__uninstall_qadll___depname) $(__uninstall_qalib___depname) $(__uninstall_xmldll___depname) $(__uninstall_xmllib___depname) $(__uninstall_xrcdll___depname) $(__uninstall_xrclib___depname) $(__uninstall_auidll___depname) $(__uninstall_auilib___depname) $(__uninstall_ribbondll___depname) $(__uninstall_ribbonlib___depname) $(__uninstall_propgriddll___depname) $(__uninstall_propgridlib___depname) $(__uninstall_richtextdll___depname) $(__uninstall_richtextlib___depname) $(__uninstall_stcdll___depname) $(__uninstall_stclib___depname) $(__uninstall_gldll___depname) $(__uninstall_gllib___depname) $(__uninstall_sound_sdl___depname) locale_uninstall locale_msw_uninstall
         (cd $(DESTDIR)$(datadir)/aclocal ; rm -f wxwin.m4)
         (cd $(DESTDIR)$(datadir)/aclocal ; rm -f wxwin.m4)
-       (cd $(DESTDIR)$(datadir)/bakefile/presets ; rm -f wx.bkl wx_unix.bkl wx_win32.bkl)
+       (cd $(DESTDIR)$(datadir)/bakefile/presets ; rm -f wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py)
         for f in setup.h $(RCDEFS_H); do \
         rm -f $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f; \
         done
         for f in setup.h $(RCDEFS_H); do \
         rm -f $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f; \
         done
@@ -12365,25 +14021,28 @@ install-strip: install
         $(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)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(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)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
         $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
         $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
         $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
         $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
         $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
         $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
         $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
         $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
         $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
         $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
         $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
         $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
         $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
         $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-       $(STRIP) $(DESTDIR)$(PLUGINS_INST_DIR)/$(DLLPREFIX_MODULE)sound_sdl$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
+       $(STRIP) $(DESTDIR)$(PLUGINS_INST_DIR)/$(DLLPREFIX_MODULE)sound_sdl$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
  
  clean: $(__clean_wxrc___depname)
         rm -rf ./.deps ./.pch
         rm -f ./*.o
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
  clean: $(__clean_wxrc___depname)
         rm -rf ./.deps ./.pch
         rm -f ./*.o
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxzlib$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxpng$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxjpeg$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxtiff$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxscintilla$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
         rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
         rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
@@ -12412,6 +14071,10 @@ clean: $(__clean_wxrc___depname)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+       rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
         rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
         rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
@@ -12428,6 +14091,14 @@ clean: $(__clean_wxrc___depname)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+       rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+       rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
         rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
         rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
@@ -12440,104 +14111,105 @@ clean: $(__clean_wxrc___depname)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-       rm -f $(DLLPREFIX_MODULE)sound_sdl$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
+       rm -f $(DLLPREFIX_MODULE)sound_sdl$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
         -(cd samples && $(MAKE) clean)
         -(cd samples && $(MAKE) clean)
-       rm -f lib/libwx_$(TOOLCHAIN_NAME).0.rsrc lib/libwx_$(TOOLCHAIN_NAME).0.r
+       rm -f lib/libwx_$(TOOLCHAIN_NAME).3.rsrc lib/libwx_$(TOOLCHAIN_NAME).3.r
  
  distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
         -(cd samples && $(MAKE) distclean)
  
  
  distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
         -(cd samples && $(MAKE) distclean)
  
-@COND_WXUSE_REGEX_BUILTIN@$(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXREGEX_OBJECTS)
-@COND_WXUSE_REGEX_BUILTIN@     rm -f $@
-@COND_WXUSE_REGEX_BUILTIN@     $(AR) $(AROPTIONS) $@ $(WXREGEX_OBJECTS)
-@COND_WXUSE_REGEX_BUILTIN@     $(RANLIB) $@
+@COND_wxUSE_REGEX_builtin@$(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXREGEX_OBJECTS)
+@COND_wxUSE_REGEX_builtin@     rm -f $@
+@COND_wxUSE_REGEX_builtin@     $(AR) $(AROPTIONS) $@ $(WXREGEX_OBJECTS)
+@COND_wxUSE_REGEX_builtin@     $(RANLIB) $@
  
  
-@COND_SHARED_0_WXUSE_REGEX_BUILTIN@install_wxregex: 
-@COND_SHARED_0_WXUSE_REGEX_BUILTIN@    $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0_WXUSE_REGEX_BUILTIN@    $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
+@COND_SHARED_0_wxUSE_REGEX_builtin@install_wxregex: $(__wxregex___depname)
+@COND_SHARED_0_wxUSE_REGEX_builtin@    $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0_wxUSE_REGEX_builtin@    $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  
-@COND_SHARED_0_WXUSE_REGEX_BUILTIN@uninstall_wxregex: 
-@COND_SHARED_0_WXUSE_REGEX_BUILTIN@    rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_SHARED_0_wxUSE_REGEX_builtin@uninstall_wxregex: 
+@COND_SHARED_0_wxUSE_REGEX_builtin@    rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
  
-@COND_WXUSE_ZLIB_BUILTIN@$(LIBDIRNAME)/$(LIBPREFIX)wxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXZLIB_OBJECTS)
-@COND_WXUSE_ZLIB_BUILTIN@      rm -f $@
-@COND_WXUSE_ZLIB_BUILTIN@      $(AR) $(AROPTIONS) $@ $(WXZLIB_OBJECTS)
-@COND_WXUSE_ZLIB_BUILTIN@      $(RANLIB) $@
+@COND_wxUSE_ZLIB_builtin@$(LIBDIRNAME)/$(LIBPREFIX)wxzlib$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXZLIB_OBJECTS)
+@COND_wxUSE_ZLIB_builtin@      rm -f $@
+@COND_wxUSE_ZLIB_builtin@      $(AR) $(AROPTIONS) $@ $(WXZLIB_OBJECTS)
+@COND_wxUSE_ZLIB_builtin@      $(RANLIB) $@
  
  
-@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@install_wxzlib: 
-@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@     $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@     $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
+@COND_SHARED_0_wxUSE_ZLIB_builtin@install_wxzlib: $(__wxzlib___depname)
+@COND_SHARED_0_wxUSE_ZLIB_builtin@     $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0_wxUSE_ZLIB_builtin@     $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxzlib$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  
-@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@uninstall_wxzlib: 
-@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@     rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_SHARED_0_wxUSE_ZLIB_builtin@uninstall_wxzlib: 
+@COND_SHARED_0_wxUSE_ZLIB_builtin@     rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxzlib$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
  
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@$(LIBDIRNAME)/$(LIBPREFIX)wxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXPNG_OBJECTS)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  rm -f $@
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  $(AR) $(AROPTIONS) $@ $(WXPNG_OBJECTS)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  $(RANLIB) $@
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@$(LIBDIRNAME)/$(LIBPREFIX)wxpng$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXPNG_OBJECTS)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@  rm -f $@
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@  $(AR) $(AROPTIONS) $@ $(WXPNG_OBJECTS)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@  $(RANLIB) $@
  
  
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@install_wxpng: 
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin@install_wxpng: $(__wxpng___depname)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxpng$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@uninstall_wxpng: 
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin@uninstall_wxpng: 
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxpng$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
  
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@$(LIBDIRNAME)/$(LIBPREFIX)wxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXJPEG_OBJECTS)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ rm -f $@
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ $(AR) $(AROPTIONS) $@ $(WXJPEG_OBJECTS)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ $(RANLIB) $@
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@$(LIBDIRNAME)/$(LIBPREFIX)wxjpeg$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXJPEG_OBJECTS)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ rm -f $@
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ $(AR) $(AROPTIONS) $@ $(WXJPEG_OBJECTS)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ $(RANLIB) $@
  
  
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@install_wxjpeg: 
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin@install_wxjpeg: $(__wxjpeg___depname)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxjpeg$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@uninstall_wxjpeg: 
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin@uninstall_wxjpeg: 
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxjpeg$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
  
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@$(LIBDIRNAME)/$(LIBPREFIX)wxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXTIFF_OBJECTS)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ rm -f $@
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ $(AR) $(AROPTIONS) $@ $(WXTIFF_OBJECTS)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ $(RANLIB) $@
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@$(LIBDIRNAME)/$(LIBPREFIX)wxtiff$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXTIFF_OBJECTS)
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ rm -f $@
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ $(AR) $(AROPTIONS) $@ $(WXTIFF_OBJECTS)
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ $(RANLIB) $@
  
  
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@install_wxtiff: 
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@install_wxtiff: $(__wxtiff___depname)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxtiff$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@uninstall_wxtiff: 
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@uninstall_wxtiff: 
+@COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxtiff$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
  
-@COND_WXUSE_EXPAT_BUILTIN@$(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXEXPAT_OBJECTS)
-@COND_WXUSE_EXPAT_BUILTIN@     rm -f $@
-@COND_WXUSE_EXPAT_BUILTIN@     $(AR) $(AROPTIONS) $@ $(WXEXPAT_OBJECTS)
-@COND_WXUSE_EXPAT_BUILTIN@     $(RANLIB) $@
+@COND_wxUSE_EXPAT_builtin@$(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXEXPAT_OBJECTS)
+@COND_wxUSE_EXPAT_builtin@     rm -f $@
+@COND_wxUSE_EXPAT_builtin@     $(AR) $(AROPTIONS) $@ $(WXEXPAT_OBJECTS)
+@COND_wxUSE_EXPAT_builtin@     $(RANLIB) $@
  
  
-@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@install_wxexpat: 
-@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@    $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@    $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
+@COND_SHARED_0_wxUSE_EXPAT_builtin@install_wxexpat: $(__wxexpat___depname)
+@COND_SHARED_0_wxUSE_EXPAT_builtin@    $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0_wxUSE_EXPAT_builtin@    $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  
-@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@uninstall_wxexpat: 
-@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@    rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_SHARED_0_wxUSE_EXPAT_builtin@uninstall_wxexpat: 
+@COND_SHARED_0_wxUSE_EXPAT_builtin@    rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxexpat$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
  
-@COND_USE_STC_1@$(LIBDIRNAME)/$(LIBPREFIX)wxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXSCINTILLA_OBJECTS)
+@COND_USE_STC_1@$(LIBDIRNAME)/$(LIBPREFIX)wxscintilla$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXSCINTILLA_OBJECTS)
  @COND_USE_STC_1@       rm -f $@
  @COND_USE_STC_1@       $(AR) $(AROPTIONS) $@ $(WXSCINTILLA_OBJECTS)
  @COND_USE_STC_1@       $(RANLIB) $@
  
  @COND_USE_STC_1@       rm -f $@
  @COND_USE_STC_1@       $(AR) $(AROPTIONS) $@ $(WXSCINTILLA_OBJECTS)
  @COND_USE_STC_1@       $(RANLIB) $@
  
-@COND_SHARED_0_USE_STC_1@install_wxscintilla: 
+@COND_SHARED_0_USE_STC_1@install_wxscintilla: $(__wxscintilla___depname)
  @COND_SHARED_0_USE_STC_1@      $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_SHARED_0_USE_STC_1@      $(INSTALL_DIR) $(DESTDIR)$(libdir)
-@COND_SHARED_0_USE_STC_1@      $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
+@COND_SHARED_0_USE_STC_1@      $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxscintilla$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_SHARED_0_USE_STC_1@uninstall_wxscintilla: 
  
  @COND_SHARED_0_USE_STC_1@uninstall_wxscintilla: 
-@COND_SHARED_0_USE_STC_1@      rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_SHARED_0_USE_STC_1@      rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxscintilla$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
  @COND_MONOLITHIC_1_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__monodll___win32rc) $(__wxscintilla_library_link_DEP)
  
  @COND_MONOLITHIC_1_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__monodll___win32rc) $(__wxscintilla_library_link_DEP)
-@COND_MONOLITHIC_1_SHARED_1@   $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(__wxscintilla_library_link_LIBR) $(LDFLAGS)   -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_MEDIA) $(PLUGIN_ADV_EXTRALIBS) $(__wxscintilla_library_link_LIBR_1)
+@COND_MONOLITHIC_1_SHARED_1@   $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(__wxscintilla_library_link_LIBR)    -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_MEDIA) $(PLUGIN_ADV_EXTRALIBS) $(__wxscintilla_library_link_LIBR_1) $(LIBS)
+@COND_MONOLITHIC_1_SHARED_1@   $(DYLIB_RPATH_POSTLINK)
  @COND_MONOLITHIC_1_SHARED_1@   
  @COND_MONOLITHIC_1_SHARED_1@   $(__monodll___so_symlinks_cmd)
  
  @COND_MONOLITHIC_1_SHARED_1@   
  @COND_MONOLITHIC_1_SHARED_1@   $(__monodll___so_symlinks_cmd)
  
-@COND_MONOLITHIC_1_SHARED_1@install_monodll: 
+@COND_MONOLITHIC_1_SHARED_1@install_monodll: $(__monodll___depname)
  @COND_MONOLITHIC_1_SHARED_1@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_1_SHARED_1@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_1_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_1_SHARED_1@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_1_SHARED_1@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_1_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@@ -12548,30 +14220,31 @@ distclean: clean
  @COND_MONOLITHIC_1_SHARED_1@   rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_1_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__monodll___so_symlinks_uninst_cmd))
  
  @COND_MONOLITHIC_1_SHARED_1@   rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_1_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__monodll___so_symlinks_uninst_cmd))
  
-@COND_USE_PCH_1@.pch/wxprec_monodll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_monodll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MONODLL_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_monodll/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_monodll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MONODLL_CXXFLAGS)
  
  @COND_MONOLITHIC_1_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(MONOLIB_OBJECTS)
  @COND_MONOLITHIC_1_SHARED_0@   rm -f $@
  @COND_MONOLITHIC_1_SHARED_0@   $(AR) $(AROPTIONS) $@ $(MONOLIB_OBJECTS)
  @COND_MONOLITHIC_1_SHARED_0@   $(RANLIB) $@
  
  
  @COND_MONOLITHIC_1_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(MONOLIB_OBJECTS)
  @COND_MONOLITHIC_1_SHARED_0@   rm -f $@
  @COND_MONOLITHIC_1_SHARED_0@   $(AR) $(AROPTIONS) $@ $(MONOLIB_OBJECTS)
  @COND_MONOLITHIC_1_SHARED_0@   $(RANLIB) $@
  
-@COND_MONOLITHIC_1_SHARED_0@install_monolib: 
+@COND_MONOLITHIC_1_SHARED_0@install_monolib: $(__monolib___depname)
  @COND_MONOLITHIC_1_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_1_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_1_SHARED_0@uninstall_monolib: 
  @COND_MONOLITHIC_1_SHARED_0@   rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
  @COND_MONOLITHIC_1_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_1_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_1_SHARED_0@uninstall_monolib: 
  @COND_MONOLITHIC_1_SHARED_0@   rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
-@COND_USE_PCH_1@.pch/wxprec_monolib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_monolib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MONOLIB_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_monolib/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_monolib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MONOLIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__basedll___win32rc)
  
  @COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__basedll___win32rc)
-@COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@ $(BASEDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__basedll___macinstnamecmd) $(__basedll___importlib) $(__basedll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+@COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@ $(BASEDLL_OBJECTS)    -L$(LIBDIRNAME) $(__basedll___macinstnamecmd) $(__basedll___importlib) $(__basedll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+@COND_MONOLITHIC_0_SHARED_1@   $(DYLIB_RPATH_POSTLINK)
  @COND_MONOLITHIC_0_SHARED_1@   
  @COND_MONOLITHIC_0_SHARED_1@   $(__basedll___so_symlinks_cmd)
  
  @COND_MONOLITHIC_0_SHARED_1@   
  @COND_MONOLITHIC_0_SHARED_1@   $(__basedll___so_symlinks_cmd)
  
-@COND_MONOLITHIC_0_SHARED_1@install_basedll: 
+@COND_MONOLITHIC_0_SHARED_1@install_basedll: $(__basedll___depname)
  @COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@@ -12582,32 +14255,33 @@ distclean: clean
  @COND_MONOLITHIC_0_SHARED_1@   rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__basedll___so_symlinks_uninst_cmd))
  
  @COND_MONOLITHIC_0_SHARED_1@   rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__basedll___so_symlinks_uninst_cmd))
  
-@COND_USE_PCH_1@.pch/wxprec_basedll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_basedll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(BASEDLL_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_basedll/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_basedll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(BASEDLL_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(BASELIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0@   rm -f $@
  @COND_MONOLITHIC_0_SHARED_0@   $(AR) $(AROPTIONS) $@ $(BASELIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0@   $(RANLIB) $@
  
  
  @COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(BASELIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0@   rm -f $@
  @COND_MONOLITHIC_0_SHARED_0@   $(AR) $(AROPTIONS) $@ $(BASELIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0@   $(RANLIB) $@
  
-@COND_MONOLITHIC_0_SHARED_0@install_baselib: 
+@COND_MONOLITHIC_0_SHARED_0@install_baselib: $(__baselib___depname)
  @COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_0_SHARED_0@uninstall_baselib: 
  @COND_MONOLITHIC_0_SHARED_0@   rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
  @COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_0_SHARED_0@uninstall_baselib: 
  @COND_MONOLITHIC_0_SHARED_0@   rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
-@COND_USE_PCH_1@.pch/wxprec_baselib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_baselib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(BASELIB_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_baselib/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_baselib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(BASELIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0@wxbase: $(____wxbase_namedll_DEP) $(____wxbase_namelib_DEP)
  
  @COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__netdll___win32rc) $(__basedll___depname)
  
  @COND_MONOLITHIC_0@wxbase: $(____wxbase_namedll_DEP) $(____wxbase_namelib_DEP)
  
  @COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__netdll___win32rc) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@ $(NETDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__netdll___macinstnamecmd) $(__netdll___importlib) $(__netdll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@ $(NETDLL_OBJECTS) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__netdll___macinstnamecmd) $(__netdll___importlib) $(__netdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
+@COND_MONOLITHIC_0_SHARED_1@   $(DYLIB_RPATH_POSTLINK)
  @COND_MONOLITHIC_0_SHARED_1@   
  @COND_MONOLITHIC_0_SHARED_1@   $(__netdll___so_symlinks_cmd)
  
  @COND_MONOLITHIC_0_SHARED_1@   
  @COND_MONOLITHIC_0_SHARED_1@   $(__netdll___so_symlinks_cmd)
  
-@COND_MONOLITHIC_0_SHARED_1@install_netdll: 
+@COND_MONOLITHIC_0_SHARED_1@install_netdll: $(__netdll___depname)
  @COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@@ -12618,32 +14292,33 @@ distclean: clean
  @COND_MONOLITHIC_0_SHARED_1@   rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__netdll___so_symlinks_uninst_cmd))
  
  @COND_MONOLITHIC_0_SHARED_1@   rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__netdll___so_symlinks_uninst_cmd))
  
-@COND_USE_PCH_1@.pch/wxprec_netdll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_netdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETDLL_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_netdll/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_netdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETDLL_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(NETLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0@   rm -f $@
  @COND_MONOLITHIC_0_SHARED_0@   $(AR) $(AROPTIONS) $@ $(NETLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0@   $(RANLIB) $@
  
  
  @COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(NETLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0@   rm -f $@
  @COND_MONOLITHIC_0_SHARED_0@   $(AR) $(AROPTIONS) $@ $(NETLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0@   $(RANLIB) $@
  
-@COND_MONOLITHIC_0_SHARED_0@install_netlib: 
+@COND_MONOLITHIC_0_SHARED_0@install_netlib: $(__netlib___depname)
  @COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_0_SHARED_0@uninstall_netlib: 
  @COND_MONOLITHIC_0_SHARED_0@   rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
  @COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_0_SHARED_0@uninstall_netlib: 
  @COND_MONOLITHIC_0_SHARED_0@   rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
-@COND_USE_PCH_1@.pch/wxprec_netlib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_netlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETLIB_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_netlib/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_netlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETLIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0@wxnet: $(____wxnet_namedll_DEP) $(____wxnet_namelib_DEP)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__coredll___win32rc) $(__basedll___depname)
  
  @COND_MONOLITHIC_0@wxnet: $(____wxnet_namedll_DEP) $(____wxnet_namelib_DEP)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__coredll___win32rc) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(COREDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__coredll___macinstnamecmd) $(__coredll___importlib) $(__coredll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(COREDLL_OBJECTS) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__coredll___macinstnamecmd) $(__coredll___importlib) $(__coredll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(DYLIB_RPATH_POSTLINK)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ 
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__coredll___so_symlinks_cmd)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ 
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__coredll___so_symlinks_cmd)
  
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_coredll: 
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_coredll: $(__coredll___depname)
  @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)_core-$(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)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
  @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)_core-$(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)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@@ -12654,32 +14329,33 @@ distclean: clean
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__coredll___so_symlinks_uninst_cmd))
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__coredll___so_symlinks_uninst_cmd))
  
-@COND_USE_PCH_1@.pch/wxprec_coredll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_coredll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(COREDLL_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_coredll/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_coredll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(COREDLL_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(CORELIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ rm -f $@
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(AR) $(AROPTIONS) $@ $(CORELIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(RANLIB) $@
  
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(CORELIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ rm -f $@
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(AR) $(AROPTIONS) $@ $(CORELIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(RANLIB) $@
  
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@install_corelib: 
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@install_corelib: $(__corelib___depname)
  @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)_core-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@uninstall_corelib: 
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
  @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)_core-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@uninstall_corelib: 
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
-@COND_USE_PCH_1@.pch/wxprec_corelib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_corelib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(CORELIB_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_corelib/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_corelib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(CORELIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0_USE_GUI_1@wxcore: $(____wxcore_namedll_DEP) $(____wxcore_namelib_DEP)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__advdll___win32rc) $(__coredll___depname) $(__basedll___depname)
  
  @COND_MONOLITHIC_0_USE_GUI_1@wxcore: $(____wxcore_namedll_DEP) $(____wxcore_namelib_DEP)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__advdll___win32rc) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(ADVDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__advdll___macinstnamecmd) $(__advdll___importlib) $(__advdll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(PLUGIN_ADV_EXTRALIBS)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(ADVDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__advdll___macinstnamecmd) $(__advdll___importlib) $(__advdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(PLUGIN_ADV_EXTRALIBS) $(LIBS)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(DYLIB_RPATH_POSTLINK)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ 
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__advdll___so_symlinks_cmd)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ 
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__advdll___so_symlinks_cmd)
  
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_advdll: 
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_advdll: $(__advdll___depname)
  @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)_adv-$(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)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
  @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)_adv-$(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)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@@ -12690,32 +14366,33 @@ distclean: clean
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__advdll___so_symlinks_uninst_cmd))
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__advdll___so_symlinks_uninst_cmd))
  
-@COND_USE_PCH_1@.pch/wxprec_advdll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_advdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ADVDLL_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_advdll/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_advdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ADVDLL_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(ADVLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ rm -f $@
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(AR) $(AROPTIONS) $@ $(ADVLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(RANLIB) $@
  
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(ADVLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ rm -f $@
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(AR) $(AROPTIONS) $@ $(ADVLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(RANLIB) $@
  
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@install_advlib: 
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@install_advlib: $(__advlib___depname)
  @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)_adv-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@uninstall_advlib: 
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
  @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)_adv-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@uninstall_advlib: 
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
-@COND_USE_PCH_1@.pch/wxprec_advlib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_advlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ADVLIB_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_advlib/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_advlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ADVLIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0_USE_GUI_1@wxadv: $(____wxadv_namedll_DEP) $(____wxadv_namelib_DEP)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__mediadll___win32rc) $(__coredll___depname) $(__basedll___depname)
  
  @COND_MONOLITHIC_0_USE_GUI_1@wxadv: $(____wxadv_namedll_DEP) $(____wxadv_namelib_DEP)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__mediadll___win32rc) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@     $(SHARED_LD_CXX) $@ $(MEDIADLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__mediadll___macinstnamecmd) $(__mediadll___importlib) $(__mediadll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_MEDIA)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@     $(SHARED_LD_CXX) $@ $(MEDIADLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__mediadll___macinstnamecmd) $(__mediadll___importlib) $(__mediadll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_MEDIA) $(LIBS)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@     $(DYLIB_RPATH_POSTLINK)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@     
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@     $(__mediadll___so_symlinks_cmd)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@     
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@     $(__mediadll___so_symlinks_cmd)
  
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@install_mediadll: 
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@install_mediadll: $(__mediadll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@     $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_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_USE_MEDIA_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_USE_MEDIA_1@     $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_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_USE_MEDIA_1@     $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@@ -12726,32 +14403,33 @@ distclean: clean
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@     rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@     (cd $(DESTDIR)$(libdir) ; $(__mediadll___so_symlinks_uninst_cmd))
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@     rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@     (cd $(DESTDIR)$(libdir) ; $(__mediadll___so_symlinks_uninst_cmd))
  
-@COND_USE_PCH_1@.pch/wxprec_mediadll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_mediadll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MEDIADLL_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_mediadll/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_mediadll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MEDIADLL_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_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_USE_MEDIA_1@     rm -f $@
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@     $(AR) $(AROPTIONS) $@ $(MEDIALIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@     $(RANLIB) $@
  
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_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_USE_MEDIA_1@     rm -f $@
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@     $(AR) $(AROPTIONS) $@ $(MEDIALIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@     $(RANLIB) $@
  
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@install_medialib: 
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@install_medialib: $(__medialib___depname)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@     $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@     $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@uninstall_medialib: 
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@     rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@     $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@     $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@uninstall_medialib: 
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@     rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
-@COND_USE_PCH_1@.pch/wxprec_medialib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_medialib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MEDIALIB_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_medialib/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_medialib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MEDIALIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1@wxmedia: $(____wxmedia_namedll_DEP) $(____wxmedia_namelib_DEP)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__htmldll___win32rc) $(__coredll___depname) $(__basedll___depname)
  
  @COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1@wxmedia: $(____wxmedia_namedll_DEP) $(____wxmedia_namelib_DEP)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__htmldll___win32rc) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      $(SHARED_LD_CXX) $@ $(HTMLDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__htmldll___macinstnamecmd) $(__htmldll___importlib) $(__htmldll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_HTML)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      $(SHARED_LD_CXX) $@ $(HTMLDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__htmldll___macinstnamecmd) $(__htmldll___importlib) $(__htmldll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_HTML) $(LIBS)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      $(DYLIB_RPATH_POSTLINK)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      $(__htmldll___so_symlinks_cmd)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      $(__htmldll___so_symlinks_cmd)
  
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@install_htmldll: 
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@install_htmldll: $(__htmldll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@@ -12762,32 +14440,70 @@ distclean: clean
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      (cd $(DESTDIR)$(libdir) ; $(__htmldll___so_symlinks_uninst_cmd))
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      (cd $(DESTDIR)$(libdir) ; $(__htmldll___so_symlinks_uninst_cmd))
  
-@COND_USE_PCH_1@.pch/wxprec_htmldll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_htmldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(HTMLDLL_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_htmldll/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_htmldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(HTMLDLL_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(HTMLLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@      rm -f $@
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@      $(AR) $(AROPTIONS) $@ $(HTMLLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@      $(RANLIB) $@
  
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(HTMLLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@      rm -f $@
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@      $(AR) $(AROPTIONS) $@ $(HTMLLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@      $(RANLIB) $@
  
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@install_htmllib: 
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@install_htmllib: $(__htmllib___depname)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@      $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@      $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@uninstall_htmllib: 
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@      rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@      $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@      $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@uninstall_htmllib: 
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@      rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
-@COND_USE_PCH_1@.pch/wxprec_htmllib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_htmllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(HTMLLIB_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_htmllib/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_htmllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(HTMLLIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0_USE_HTML_1@wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP)
  
  
  @COND_MONOLITHIC_0_USE_HTML_1@wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP)
  
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(WEBVIEWDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__webviewdll___win32rc) $(__coredll___depname) $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@   $(SHARED_LD_CXX) $@ $(WEBVIEWDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__webviewdll___macinstnamecmd) $(__webviewdll___importlib) $(__webviewdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@   $(DYLIB_RPATH_POSTLINK)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@   
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@   $(__webviewdll___so_symlinks_cmd)
+
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@install_webviewdll: $(__webviewdll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@   (cd $(DESTDIR)$(libdir) ; $(__webviewdll___so_symlinks_inst_cmd))
+
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@uninstall_webviewdll: 
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@   rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@   rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1@   (cd $(DESTDIR)$(libdir) ; $(__webviewdll___so_symlinks_uninst_cmd))
+
+@COND_USE_PCH_1@./.pch/wxprec_webviewdll/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_webviewdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(WEBVIEWDLL_CXXFLAGS)
+
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WEBVIEWLIB_OBJECTS)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1@   rm -f $@
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1@   $(AR) $(AROPTIONS) $@ $(WEBVIEWLIB_OBJECTS)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1@   $(RANLIB) $@
+
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1@install_webviewlib: $(__webviewlib___depname)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
+
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1@uninstall_webviewlib: 
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1@   rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+
+@COND_USE_PCH_1@./.pch/wxprec_webviewlib/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_webviewlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(WEBVIEWLIB_CXXFLAGS)
+
+@COND_MONOLITHIC_0_USE_WEBVIEW_1@wxwebview: $(____wxwebview_namedll_DEP) $(____wxwebview_namelib_DEP)
+
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__qadll___win32rc) $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__qadll___win32rc) $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@        $(SHARED_LD_CXX) $@ $(QADLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__qadll___macinstnamecmd) $(__qadll___importlib) $(__qadll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@        $(SHARED_LD_CXX) $@ $(QADLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__qadll___macinstnamecmd) $(__qadll___importlib) $(__qadll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@        $(DYLIB_RPATH_POSTLINK)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@        
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@        $(__qadll___so_symlinks_cmd)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@        
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@        $(__qadll___so_symlinks_cmd)
  
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@install_qadll: 
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@install_qadll: $(__qadll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@@ -12798,32 +14514,33 @@ distclean: clean
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@        rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@        (cd $(DESTDIR)$(libdir) ; $(__qadll___so_symlinks_uninst_cmd))
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@        rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@        (cd $(DESTDIR)$(libdir) ; $(__qadll___so_symlinks_uninst_cmd))
  
-@COND_USE_PCH_1@.pch/wxprec_qadll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_qadll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(QADLL_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_qadll/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_qadll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(QADLL_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(QALIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@        rm -f $@
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@        $(AR) $(AROPTIONS) $@ $(QALIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@        $(RANLIB) $@
  
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(QALIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@        rm -f $@
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@        $(AR) $(AROPTIONS) $@ $(QALIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@        $(RANLIB) $@
  
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@install_qalib: 
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@install_qalib: $(__qalib___depname)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@uninstall_qalib: 
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@uninstall_qalib: 
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
-@COND_USE_PCH_1@.pch/wxprec_qalib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_qalib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(QALIB_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_qalib/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_qalib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(QALIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0_USE_QA_1@wxqa: $(____wxqa_namedll_DEP) $(____wxqa_namelib_DEP)
  
  @COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__xmldll___win32rc) $(__basedll___depname)
  
  @COND_MONOLITHIC_0_USE_QA_1@wxqa: $(____wxqa_namedll_DEP) $(____wxqa_namelib_DEP)
  
  @COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__xmldll___win32rc) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@ $(XMLDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__xmldll___macinstnamecmd) $(__xmldll___importlib) $(__xmldll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_XML)
+@COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@ $(XMLDLL_OBJECTS) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__xmldll___macinstnamecmd) $(__xmldll___importlib) $(__xmldll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_XML) $(LIBS)
+@COND_MONOLITHIC_0_SHARED_1@   $(DYLIB_RPATH_POSTLINK)
  @COND_MONOLITHIC_0_SHARED_1@   
  @COND_MONOLITHIC_0_SHARED_1@   $(__xmldll___so_symlinks_cmd)
  
  @COND_MONOLITHIC_0_SHARED_1@   
  @COND_MONOLITHIC_0_SHARED_1@   $(__xmldll___so_symlinks_cmd)
  
-@COND_MONOLITHIC_0_SHARED_1@install_xmldll: 
+@COND_MONOLITHIC_0_SHARED_1@install_xmldll: $(__xmldll___depname)
  @COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@@ -12834,32 +14551,33 @@ distclean: clean
  @COND_MONOLITHIC_0_SHARED_1@   rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__xmldll___so_symlinks_uninst_cmd))
  
  @COND_MONOLITHIC_0_SHARED_1@   rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__xmldll___so_symlinks_uninst_cmd))
  
-@COND_USE_PCH_1@.pch/wxprec_xmldll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_xmldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XMLDLL_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_xmldll/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_xmldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XMLDLL_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(XMLLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0@   rm -f $@
  @COND_MONOLITHIC_0_SHARED_0@   $(AR) $(AROPTIONS) $@ $(XMLLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0@   $(RANLIB) $@
  
  
  @COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(XMLLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0@   rm -f $@
  @COND_MONOLITHIC_0_SHARED_0@   $(AR) $(AROPTIONS) $@ $(XMLLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0@   $(RANLIB) $@
  
-@COND_MONOLITHIC_0_SHARED_0@install_xmllib: 
+@COND_MONOLITHIC_0_SHARED_0@install_xmllib: $(__xmllib___depname)
  @COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_0_SHARED_0@uninstall_xmllib: 
  @COND_MONOLITHIC_0_SHARED_0@   rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
  @COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_0_SHARED_0@uninstall_xmllib: 
  @COND_MONOLITHIC_0_SHARED_0@   rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
-@COND_USE_PCH_1@.pch/wxprec_xmllib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_xmllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XMLLIB_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_xmllib/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_xmllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XMLLIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0@wxxml: $(____wxxml_namedll_DEP) $(____wxxml_namelib_DEP)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__xrcdll___win32rc) $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
  
  @COND_MONOLITHIC_0@wxxml: $(____wxxml_namedll_DEP) $(____wxxml_namelib_DEP)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__xrcdll___win32rc) $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(SHARED_LD_CXX) $@ $(XRCDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__htmldll_library_link_LIBR) $(LDFLAGS)   -L$(LIBDIRNAME) $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__htmldll_library_link_LIBR_0) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(SHARED_LD_CXX) $@ $(XRCDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__htmldll_library_link_LIBR)    -L$(LIBDIRNAME) $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__htmldll_library_link_LIBR_0) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
+@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(DYLIB_RPATH_POSTLINK)
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ 
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(__xrcdll___so_symlinks_cmd)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ 
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(__xrcdll___so_symlinks_cmd)
  
-@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@install_xrcdll: 
+@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@install_xrcdll: $(__xrcdll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@@ -12870,32 +14588,33 @@ distclean: clean
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ (cd $(DESTDIR)$(libdir) ; $(__xrcdll___so_symlinks_uninst_cmd))
  
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ (cd $(DESTDIR)$(libdir) ; $(__xrcdll___so_symlinks_uninst_cmd))
  
-@COND_USE_PCH_1@.pch/wxprec_xrcdll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_xrcdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XRCDLL_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_xrcdll/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_xrcdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XRCDLL_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(XRCLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ rm -f $@
  @COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ $(AR) $(AROPTIONS) $@ $(XRCLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ $(RANLIB) $@
  
  
  @COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(XRCLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ rm -f $@
  @COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ $(AR) $(AROPTIONS) $@ $(XRCLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ $(RANLIB) $@
  
-@COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@install_xrclib: 
+@COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@install_xrclib: $(__xrclib___depname)
  @COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@uninstall_xrclib: 
  @COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@uninstall_xrclib: 
  @COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
-@COND_USE_PCH_1@.pch/wxprec_xrclib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_xrclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XRCLIB_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_xrclib/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_xrclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XRCLIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0_USE_XRC_1@wxxrc: $(____wxxrc_namedll_DEP) $(____wxxrc_namelib_DEP)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__auidll___win32rc) $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
  
  @COND_MONOLITHIC_0_USE_XRC_1@wxxrc: $(____wxxrc_namedll_DEP) $(____wxxrc_namelib_DEP)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__auidll___win32rc) $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(SHARED_LD_CXX) $@ $(AUIDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__auidll___macinstnamecmd) $(__auidll___importlib) $(__auidll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(SHARED_LD_CXX) $@ $(AUIDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__auidll___macinstnamecmd) $(__auidll___importlib) $(__auidll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
+@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(DYLIB_RPATH_POSTLINK)
  @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ 
  @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(__auidll___so_symlinks_cmd)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ 
  @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(__auidll___so_symlinks_cmd)
  
-@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@install_auidll: 
+@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@install_auidll: $(__auidll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@@ -12906,32 +14625,107 @@ distclean: clean
  @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ (cd $(DESTDIR)$(libdir) ; $(__auidll___so_symlinks_uninst_cmd))
  
  @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ (cd $(DESTDIR)$(libdir) ; $(__auidll___so_symlinks_uninst_cmd))
  
-@COND_USE_PCH_1@.pch/wxprec_auidll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_auidll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(AUIDLL_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_auidll/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_auidll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(AUIDLL_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(AUILIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@ rm -f $@
  @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@ $(AR) $(AROPTIONS) $@ $(AUILIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@ $(RANLIB) $@
  
  
  @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(AUILIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@ rm -f $@
  @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@ $(AR) $(AROPTIONS) $@ $(AUILIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@ $(RANLIB) $@
  
-@COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@install_auilib: 
+@COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@install_auilib: $(__auilib___depname)
  @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@uninstall_auilib: 
  @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@uninstall_auilib: 
  @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
-@COND_USE_PCH_1@.pch/wxprec_auilib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_auilib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(AUILIB_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_auilib/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_auilib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(AUILIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0_USE_AUI_1@wxaui: $(____wxaui_namedll_DEP) $(____wxaui_namelib_DEP)
  
  
  @COND_MONOLITHIC_0_USE_AUI_1@wxaui: $(____wxaui_namedll_DEP) $(____wxaui_namelib_DEP)
  
+@COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(RIBBONDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__ribbondll___win32rc) $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@      $(SHARED_LD_CXX) $@ $(RIBBONDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__ribbondll___macinstnamecmd) $(__ribbondll___importlib) $(__ribbondll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
+@COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@      $(DYLIB_RPATH_POSTLINK)
+@COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@      
+@COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@      $(__ribbondll___so_symlinks_cmd)
+
+@COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@install_ribbondll: $(__ribbondll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@      $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@      $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@      $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@      (cd $(DESTDIR)$(libdir) ; $(__ribbondll___so_symlinks_inst_cmd))
+
+@COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@uninstall_ribbondll: 
+@COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@      rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@      rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1@      (cd $(DESTDIR)$(libdir) ; $(__ribbondll___so_symlinks_uninst_cmd))
+
+@COND_USE_PCH_1@./.pch/wxprec_ribbondll/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_ribbondll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(RIBBONDLL_CXXFLAGS)
+
+@COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(RIBBONLIB_OBJECTS)
+@COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1@      rm -f $@
+@COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1@      $(AR) $(AROPTIONS) $@ $(RIBBONLIB_OBJECTS)
+@COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1@      $(RANLIB) $@
+
+@COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1@install_ribbonlib: $(__ribbonlib___depname)
+@COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1@      $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1@      $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
+
+@COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1@uninstall_ribbonlib: 
+@COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1@      rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+
+@COND_USE_PCH_1@./.pch/wxprec_ribbonlib/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_ribbonlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(RIBBONLIB_CXXFLAGS)
+
+@COND_MONOLITHIC_0_USE_RIBBON_1@wxribbon: $(____wxribbon_namedll_DEP) $(____wxribbon_namelib_DEP)
+
+@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(PROPGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__propgriddll___win32rc) $(__advdll___depname) $(__coredll___depname) $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@    $(SHARED_LD_CXX) $@ $(PROPGRIDDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__propgriddll___macinstnamecmd) $(__propgriddll___importlib) $(__propgriddll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
+@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@    $(DYLIB_RPATH_POSTLINK)
+@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@    
+@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@    $(__propgriddll___so_symlinks_cmd)
+
+@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@install_propgriddll: $(__propgriddll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@    $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@    $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@    $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@    (cd $(DESTDIR)$(libdir) ; $(__propgriddll___so_symlinks_inst_cmd))
+
+@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@uninstall_propgriddll: 
+@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@    rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@    rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1@    (cd $(DESTDIR)$(libdir) ; $(__propgriddll___so_symlinks_uninst_cmd))
+
+@COND_USE_PCH_1@./.pch/wxprec_propgriddll/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_propgriddll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(PROPGRIDDLL_CXXFLAGS)
+
+@COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(PROPGRIDLIB_OBJECTS)
+@COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1@    rm -f $@
+@COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1@    $(AR) $(AROPTIONS) $@ $(PROPGRIDLIB_OBJECTS)
+@COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1@    $(RANLIB) $@
+
+@COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1@install_propgridlib: $(__propgridlib___depname)
+@COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1@    $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1@    $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
+
+@COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1@uninstall_propgridlib: 
+@COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1@    rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+
+@COND_USE_PCH_1@./.pch/wxprec_propgridlib/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_propgridlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(PROPGRIDLIB_CXXFLAGS)
+
+@COND_MONOLITHIC_0_USE_PROPGRID_1@wxpropgrid: $(____wxpropgrid_namedll_DEP) $(____wxpropgrid_namelib_DEP)
+
  @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__richtextdll___win32rc) $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__richtextdll___win32rc) $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@    $(SHARED_LD_CXX) $@ $(RICHTEXTDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__htmldll_library_link_LIBR) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__richtextdll___macinstnamecmd) $(__richtextdll___importlib) $(__richtextdll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) $(__htmldll_library_link_LIBR_0) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@    $(SHARED_LD_CXX) $@ $(RICHTEXTDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(__htmldll_library_link_LIBR) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__richtextdll___macinstnamecmd) $(__richtextdll___importlib) $(__richtextdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) $(__htmldll_library_link_LIBR_0) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
+@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@    $(DYLIB_RPATH_POSTLINK)
  @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@    
  @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@    $(__richtextdll___so_symlinks_cmd)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@    
  @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@    $(__richtextdll___so_symlinks_cmd)
  
-@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@install_richtextdll: 
+@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@install_richtextdll: $(__richtextdll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@    $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@    $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@    $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@    $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@    $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@    $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@@ -12942,32 +14736,33 @@ distclean: clean
  @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@    rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@    (cd $(DESTDIR)$(libdir) ; $(__richtextdll___so_symlinks_uninst_cmd))
  
  @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@    rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@    (cd $(DESTDIR)$(libdir) ; $(__richtextdll___so_symlinks_uninst_cmd))
  
-@COND_USE_PCH_1@.pch/wxprec_richtextdll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_richtextdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(RICHTEXTDLL_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_richtextdll/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_richtextdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(RICHTEXTDLL_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(RICHTEXTLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@    rm -f $@
  @COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@    $(AR) $(AROPTIONS) $@ $(RICHTEXTLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@    $(RANLIB) $@
  
  
  @COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(RICHTEXTLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@    rm -f $@
  @COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@    $(AR) $(AROPTIONS) $@ $(RICHTEXTLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@    $(RANLIB) $@
  
-@COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@install_richtextlib: 
+@COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@install_richtextlib: $(__richtextlib___depname)
  @COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@    $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@    $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@uninstall_richtextlib: 
  @COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@    rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@    $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@    $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@uninstall_richtextlib: 
  @COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@    rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
-@COND_USE_PCH_1@.pch/wxprec_richtextlib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_richtextlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(RICHTEXTLIB_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_richtextlib/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_richtextlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(RICHTEXTLIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0_USE_RICHTEXT_1@wxrichtext: $(____wxrichtext_namedll_DEP) $(____wxrichtext_namelib_DEP)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__wxscintilla___depname) $(__stcdll___win32rc) $(__coredll___depname) $(__basedll___depname)
  
  @COND_MONOLITHIC_0_USE_RICHTEXT_1@wxrichtext: $(____wxrichtext_namedll_DEP) $(____wxrichtext_namelib_DEP)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__wxscintilla___depname) $(__stcdll___win32rc) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(SHARED_LD_CXX) $@ $(STCDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(SHARED_LD_CXX) $@ $(STCDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME)    -L$(LIBDIRNAME) $(__stcdll___macinstnamecmd) $(__stcdll___importlib) $(__stcdll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwxscintilla$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(LIBS)
+@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(DYLIB_RPATH_POSTLINK)
  @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ 
  @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(__stcdll___so_symlinks_cmd)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ 
  @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(__stcdll___so_symlinks_cmd)
  
-@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@install_stcdll: 
+@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@install_stcdll: $(__stcdll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@@ -12978,32 +14773,33 @@ distclean: clean
  @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ (cd $(DESTDIR)$(libdir) ; $(__stcdll___so_symlinks_uninst_cmd))
  
  @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ (cd $(DESTDIR)$(libdir) ; $(__stcdll___so_symlinks_uninst_cmd))
  
-@COND_USE_PCH_1@.pch/wxprec_stcdll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_stcdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(STCDLL_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_stcdll/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_stcdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(STCDLL_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_STC_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(STCLIB_OBJECTS) $(__wxscintilla___depname)
  @COND_MONOLITHIC_0_SHARED_0_USE_STC_1@ rm -f $@
  @COND_MONOLITHIC_0_SHARED_0_USE_STC_1@ $(AR) $(AROPTIONS) $@ $(STCLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_STC_1@ $(RANLIB) $@
  
  
  @COND_MONOLITHIC_0_SHARED_0_USE_STC_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(STCLIB_OBJECTS) $(__wxscintilla___depname)
  @COND_MONOLITHIC_0_SHARED_0_USE_STC_1@ rm -f $@
  @COND_MONOLITHIC_0_SHARED_0_USE_STC_1@ $(AR) $(AROPTIONS) $@ $(STCLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_STC_1@ $(RANLIB) $@
  
-@COND_MONOLITHIC_0_SHARED_0_USE_STC_1@install_stclib: 
+@COND_MONOLITHIC_0_SHARED_0_USE_STC_1@install_stclib: $(__stclib___depname)
  @COND_MONOLITHIC_0_SHARED_0_USE_STC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_0_USE_STC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_STC_1@uninstall_stclib: 
  @COND_MONOLITHIC_0_SHARED_0_USE_STC_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_STC_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_0_USE_STC_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_STC_1@uninstall_stclib: 
  @COND_MONOLITHIC_0_SHARED_0_USE_STC_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
-@COND_USE_PCH_1@.pch/wxprec_stclib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_stclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(STCLIB_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_stclib/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_stclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(STCLIB_CXXFLAGS)
  
  @COND_MONOLITHIC_0_USE_STC_1@wxstc: $(____wxstc_namedll_DEP) $(____wxstc_namelib_DEP)
  
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__gldll___win32rc) $(__basedll___depname) $(__coredll___depname) $(__monodll___depname)
  
  @COND_MONOLITHIC_0_USE_STC_1@wxstc: $(____wxstc_namedll_DEP) $(____wxstc_namelib_DEP)
  
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxregex___depname) $(__gldll___win32rc) $(__basedll___depname) $(__coredll___depname) $(__monodll___depname)
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(SHARED_LD_CXX) $@ $(GLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__gldll___macinstnamecmd) $(__gldll___importlib) $(__gldll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) $(EXTRALIBS_OPENGL)
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(SHARED_LD_CXX) $@ $(GLDLL_OBJECTS)    -L$(LIBDIRNAME) $(__gldll___macinstnamecmd) $(__gldll___importlib) $(__gldll___soname_flags) $(WXMACVERSION_CMD) $(LDFLAGS)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) $(EXTRALIBS_OPENGL) $(LIBS)
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(DYLIB_RPATH_POSTLINK)
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ 
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(__gldll___so_symlinks_cmd)
  
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ 
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(__gldll___so_symlinks_cmd)
  
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@install_gldll: 
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@install_gldll: $(__gldll___depname)
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir)
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
@@ -13014,35 +14810,35 @@ distclean: clean
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ (cd $(DESTDIR)$(libdir) ; $(__gldll___so_symlinks_uninst_cmd))
  
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ (cd $(DESTDIR)$(libdir) ; $(__gldll___so_symlinks_uninst_cmd))
  
-@COND_USE_PCH_1@.pch/wxprec_gldll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_gldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GLDLL_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_gldll/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_gldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GLDLL_CXXFLAGS)
  
  @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(GLLIB_OBJECTS)
  @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ rm -f $@
  @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(AR) $(AROPTIONS) $@ $(GLLIB_OBJECTS)
  @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(RANLIB) $@
  
  
  @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(GLLIB_OBJECTS)
  @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ rm -f $@
  @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(AR) $(AROPTIONS) $@ $(GLLIB_OBJECTS)
  @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(RANLIB) $@
  
-@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@install_gllib: 
+@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@install_gllib: $(__gllib___depname)
  @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@uninstall_gllib: 
  @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
  @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@uninstall_gllib: 
  @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  
-@COND_USE_PCH_1@.pch/wxprec_gllib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_gllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GLLIB_CXXFLAGS)
+@COND_USE_PCH_1@./.pch/wxprec_gllib/wx/wxprec.h.gch: 
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) ./.pch/wxprec_gllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GLLIB_CXXFLAGS)
  
  @COND_USE_GUI_1_USE_OPENGL_1@wxgl: $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP)
  
  
  @COND_USE_GUI_1_USE_OPENGL_1@wxgl: $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP)
  
-@COND_WITH_PLUGIN_SDL_1@$(DLLPREFIX_MODULE)sound_sdl$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE): $(SOUND_SDL_OBJECTS)
-@COND_WITH_PLUGIN_SDL_1@       $(SHARED_LD_MODULE_CXX) $@ $(SOUND_SDL_OBJECTS) $(LDFLAGS)  $(LIBS) $(EXTRALIBS_SDL)
+@COND_WITH_PLUGIN_SDL_1@$(DLLPREFIX_MODULE)sound_sdl$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE): $(SOUND_SDL_OBJECTS)
+@COND_WITH_PLUGIN_SDL_1@       $(SHARED_LD_MODULE_CXX) $@ $(SOUND_SDL_OBJECTS)  $(LDFLAGS)  $(EXTRALIBS_SDL) $(LIBS)
  
  
-@COND_WITH_PLUGIN_SDL_1@install_sound_sdl: 
+@COND_WITH_PLUGIN_SDL_1@install_sound_sdl: $(__sound_sdl___depname)
  @COND_WITH_PLUGIN_SDL_1@       $(INSTALL_DIR) $(DESTDIR)$(PLUGINS_INST_DIR)
  @COND_WITH_PLUGIN_SDL_1@       $(INSTALL_DIR) $(DESTDIR)$(PLUGINS_INST_DIR)
-@COND_WITH_PLUGIN_SDL_1@       $(INSTALL_PROGRAM) $(DLLPREFIX_MODULE)sound_sdl$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE) $(DESTDIR)$(PLUGINS_INST_DIR)
+@COND_WITH_PLUGIN_SDL_1@       $(INSTALL_PROGRAM) $(DLLPREFIX_MODULE)sound_sdl$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE) $(DESTDIR)$(PLUGINS_INST_DIR)
  
  @COND_WITH_PLUGIN_SDL_1@uninstall_sound_sdl: 
  
  @COND_WITH_PLUGIN_SDL_1@uninstall_sound_sdl: 
-@COND_WITH_PLUGIN_SDL_1@       rm -f $(DESTDIR)$(PLUGINS_INST_DIR)/$(DLLPREFIX_MODULE)sound_sdl$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
+@COND_WITH_PLUGIN_SDL_1@       rm -f $(DESTDIR)$(PLUGINS_INST_DIR)/$(DLLPREFIX_MODULE)sound_sdl$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
  
  samples: 
         (cd samples && $(MAKE) all)
  
  samples: 
         (cd samples && $(MAKE) all)
@@ -13096,13 +14892,13 @@ locale_msw_uninstall:
         fi ; \
         done
  
         fi ; \
         done
  
-@COND_TOOLKIT_COCOA@lib/libwx_$(TOOLCHAIN_NAME).0.r: 
-@COND_TOOLKIT_COCOA@   $(REZ) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o lib/libwx_$(TOOLCHAIN_NAME).0.rsrc
-@COND_TOOLKIT_COCOA@   $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).0.rsrc -useDF >lib/libwx_$(TOOLCHAIN_NAME).0.r
+@COND_TOOLKIT_COCOA@lib/libwx_$(TOOLCHAIN_NAME).3.r: 
+@COND_TOOLKIT_COCOA@   $(REZ) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o lib/libwx_$(TOOLCHAIN_NAME).3.rsrc
+@COND_TOOLKIT_COCOA@   $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).3.rsrc -useDF >lib/libwx_$(TOOLCHAIN_NAME).3.r
  
  @COND_TOOLKIT_COCOA@cocoa-res-install: $(__cocoa_res___depname)
  
  @COND_TOOLKIT_COCOA@cocoa-res-install: $(__cocoa_res___depname)
-@COND_TOOLKIT_COCOA@   $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).0.r $(libdir)
-@COND_TOOLKIT_COCOA@   $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).0.rsrc $(libdir)
+@COND_TOOLKIT_COCOA@   $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).3.r $(libdir)
+@COND_TOOLKIT_COCOA@   $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).3.rsrc $(libdir)
  
  wxregex_regcomp.o: $(srcdir)/src/regex/regcomp.c
         $(CCC) -c -o $@ $(WXREGEX_CFLAGS) $(srcdir)/src/regex/regcomp.c
  
  wxregex_regcomp.o: $(srcdir)/src/regex/regcomp.c
         $(CCC) -c -o $@ $(WXREGEX_CFLAGS) $(srcdir)/src/regex/regcomp.c
@@ -13158,9 +14954,6 @@ wxpng_png.o: $(srcdir)/src/png/png.c
  wxpng_pngerror.o: $(srcdir)/src/png/pngerror.c
         $(CCC) -c -o $@ $(WXPNG_CFLAGS) $(srcdir)/src/png/pngerror.c
  
  wxpng_pngerror.o: $(srcdir)/src/png/pngerror.c
         $(CCC) -c -o $@ $(WXPNG_CFLAGS) $(srcdir)/src/png/pngerror.c
  
-wxpng_pnggccrd.o: $(srcdir)/src/png/pnggccrd.c
-       $(CCC) -c -o $@ $(WXPNG_CFLAGS) $(srcdir)/src/png/pnggccrd.c
-
  wxpng_pngget.o: $(srcdir)/src/png/pngget.c
         $(CCC) -c -o $@ $(WXPNG_CFLAGS) $(srcdir)/src/png/pngget.c
  
  wxpng_pngget.o: $(srcdir)/src/png/pngget.c
         $(CCC) -c -o $@ $(WXPNG_CFLAGS) $(srcdir)/src/png/pngget.c
  
@@ -13188,9 +14981,6 @@ wxpng_pngset.o: $(srcdir)/src/png/pngset.c
  wxpng_pngtrans.o: $(srcdir)/src/png/pngtrans.c
         $(CCC) -c -o $@ $(WXPNG_CFLAGS) $(srcdir)/src/png/pngtrans.c
  
  wxpng_pngtrans.o: $(srcdir)/src/png/pngtrans.c
         $(CCC) -c -o $@ $(WXPNG_CFLAGS) $(srcdir)/src/png/pngtrans.c
  
-wxpng_pngvcrd.o: $(srcdir)/src/png/pngvcrd.c
-       $(CCC) -c -o $@ $(WXPNG_CFLAGS) $(srcdir)/src/png/pngvcrd.c
-
  wxpng_pngwio.o: $(srcdir)/src/png/pngwio.c
         $(CCC) -c -o $@ $(WXPNG_CFLAGS) $(srcdir)/src/png/pngwio.c
  
  wxpng_pngwio.o: $(srcdir)/src/png/pngwio.c
         $(CCC) -c -o $@ $(WXPNG_CFLAGS) $(srcdir)/src/png/pngwio.c
  
@@ -13515,12 +15305,12 @@ wxscintilla_KeyWords.o: $(srcdir)/src/stc/scintilla/src/KeyWords.cxx
  wxscintilla_LexAPDL.o: $(srcdir)/src/stc/scintilla/src/LexAPDL.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexAPDL.cxx
  
  wxscintilla_LexAPDL.o: $(srcdir)/src/stc/scintilla/src/LexAPDL.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexAPDL.cxx
  
-wxscintilla_LexAU3.o: $(srcdir)/src/stc/scintilla/src/LexAU3.cxx
-       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexAU3.cxx
-
  wxscintilla_LexASY.o: $(srcdir)/src/stc/scintilla/src/LexASY.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexASY.cxx
  
  wxscintilla_LexASY.o: $(srcdir)/src/stc/scintilla/src/LexASY.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexASY.cxx
  
+wxscintilla_LexAU3.o: $(srcdir)/src/stc/scintilla/src/LexAU3.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexAU3.cxx
+
  wxscintilla_LexAVE.o: $(srcdir)/src/stc/scintilla/src/LexAVE.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexAVE.cxx
  
  wxscintilla_LexAVE.o: $(srcdir)/src/stc/scintilla/src/LexAVE.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexAVE.cxx
  
@@ -13551,8 +15341,8 @@ wxscintilla_LexBullant.o: $(srcdir)/src/stc/scintilla/src/LexBullant.cxx
  wxscintilla_LexCLW.o: $(srcdir)/src/stc/scintilla/src/LexCLW.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexCLW.cxx
  
  wxscintilla_LexCLW.o: $(srcdir)/src/stc/scintilla/src/LexCLW.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexCLW.cxx
  
-wxscintilla_LexCmake.o: $(srcdir)/src/stc/scintilla/src/LexCmake.cxx
-       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexCmake.cxx
+wxscintilla_LexCOBOL.o: $(srcdir)/src/stc/scintilla/src/LexCOBOL.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexCOBOL.cxx
  
  wxscintilla_LexCPP.o: $(srcdir)/src/stc/scintilla/src/LexCPP.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexCPP.cxx
  
  wxscintilla_LexCPP.o: $(srcdir)/src/stc/scintilla/src/LexCPP.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexCPP.cxx
@@ -13563,8 +15353,8 @@ wxscintilla_LexCSS.o: $(srcdir)/src/stc/scintilla/src/LexCSS.cxx
  wxscintilla_LexCaml.o: $(srcdir)/src/stc/scintilla/src/LexCaml.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexCaml.cxx
  
  wxscintilla_LexCaml.o: $(srcdir)/src/stc/scintilla/src/LexCaml.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexCaml.cxx
  
-wxscintilla_LexCsound.o: $(srcdir)/src/stc/scintilla/src/LexCsound.cxx
-       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexCsound.cxx
+wxscintilla_LexCmake.o: $(srcdir)/src/stc/scintilla/src/LexCmake.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexCmake.cxx
  
  wxscintilla_LexConf.o: $(srcdir)/src/stc/scintilla/src/LexConf.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexConf.cxx
  
  wxscintilla_LexConf.o: $(srcdir)/src/stc/scintilla/src/LexConf.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexConf.cxx
@@ -13572,6 +15362,9 @@ wxscintilla_LexConf.o: $(srcdir)/src/stc/scintilla/src/LexConf.cxx
  wxscintilla_LexCrontab.o: $(srcdir)/src/stc/scintilla/src/LexCrontab.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexCrontab.cxx
  
  wxscintilla_LexCrontab.o: $(srcdir)/src/stc/scintilla/src/LexCrontab.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexCrontab.cxx
  
+wxscintilla_LexCsound.o: $(srcdir)/src/stc/scintilla/src/LexCsound.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexCsound.cxx
+
  wxscintilla_LexD.o: $(srcdir)/src/stc/scintilla/src/LexD.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexD.cxx
  
  wxscintilla_LexD.o: $(srcdir)/src/stc/scintilla/src/LexD.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexD.cxx
  
@@ -13629,12 +15422,24 @@ wxscintilla_LexMPT.o: $(srcdir)/src/stc/scintilla/src/LexMPT.cxx
  wxscintilla_LexMSSQL.o: $(srcdir)/src/stc/scintilla/src/LexMSSQL.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexMSSQL.cxx
  
  wxscintilla_LexMSSQL.o: $(srcdir)/src/stc/scintilla/src/LexMSSQL.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexMSSQL.cxx
  
+wxscintilla_LexMagik.o: $(srcdir)/src/stc/scintilla/src/LexMagik.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexMagik.cxx
+
+wxscintilla_LexMarkdown.o: $(srcdir)/src/stc/scintilla/src/LexMarkdown.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexMarkdown.cxx
+
  wxscintilla_LexMatlab.o: $(srcdir)/src/stc/scintilla/src/LexMatlab.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexMatlab.cxx
  
  wxscintilla_LexMetapost.o: $(srcdir)/src/stc/scintilla/src/LexMetapost.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexMetapost.cxx
  
  wxscintilla_LexMatlab.o: $(srcdir)/src/stc/scintilla/src/LexMatlab.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexMatlab.cxx
  
  wxscintilla_LexMetapost.o: $(srcdir)/src/stc/scintilla/src/LexMetapost.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexMetapost.cxx
  
+wxscintilla_LexMySQL.o: $(srcdir)/src/stc/scintilla/src/LexMySQL.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexMySQL.cxx
+
+wxscintilla_LexNimrod.o: $(srcdir)/src/stc/scintilla/src/LexNimrod.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexNimrod.cxx
+
  wxscintilla_LexNsis.o: $(srcdir)/src/stc/scintilla/src/LexNsis.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexNsis.cxx
  
  wxscintilla_LexNsis.o: $(srcdir)/src/stc/scintilla/src/LexNsis.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexNsis.cxx
  
@@ -13653,9 +15458,6 @@ wxscintilla_LexPLM.o: $(srcdir)/src/stc/scintilla/src/LexPLM.cxx
  wxscintilla_LexPOV.o: $(srcdir)/src/stc/scintilla/src/LexPOV.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexPOV.cxx
  
  wxscintilla_LexPOV.o: $(srcdir)/src/stc/scintilla/src/LexPOV.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexPOV.cxx
  
-wxscintilla_LexProgress.o: $(srcdir)/src/stc/scintilla/src/LexProgress.cxx
-       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexProgress.cxx
-
  wxscintilla_LexPS.o: $(srcdir)/src/stc/scintilla/src/LexPS.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexPS.cxx
  
  wxscintilla_LexPS.o: $(srcdir)/src/stc/scintilla/src/LexPS.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexPS.cxx
  
@@ -13665,6 +15467,15 @@ wxscintilla_LexPascal.o: $(srcdir)/src/stc/scintilla/src/LexPascal.cxx
  wxscintilla_LexPerl.o: $(srcdir)/src/stc/scintilla/src/LexPerl.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexPerl.cxx
  
  wxscintilla_LexPerl.o: $(srcdir)/src/stc/scintilla/src/LexPerl.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexPerl.cxx
  
+wxscintilla_LexPowerPro.o: $(srcdir)/src/stc/scintilla/src/LexPowerPro.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexPowerPro.cxx
+
+wxscintilla_LexPowerShell.o: $(srcdir)/src/stc/scintilla/src/LexPowerShell.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexPowerShell.cxx
+
+wxscintilla_LexProgress.o: $(srcdir)/src/stc/scintilla/src/LexProgress.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexProgress.cxx
+
  wxscintilla_LexPython.o: $(srcdir)/src/stc/scintilla/src/LexPython.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexPython.cxx
  
  wxscintilla_LexPython.o: $(srcdir)/src/stc/scintilla/src/LexPython.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexPython.cxx
  
@@ -13677,17 +15488,20 @@ wxscintilla_LexRebol.o: $(srcdir)/src/stc/scintilla/src/LexRebol.cxx
  wxscintilla_LexRuby.o: $(srcdir)/src/stc/scintilla/src/LexRuby.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexRuby.cxx
  
  wxscintilla_LexRuby.o: $(srcdir)/src/stc/scintilla/src/LexRuby.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexRuby.cxx
  
+wxscintilla_LexSML.o: $(srcdir)/src/stc/scintilla/src/LexSML.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexSML.cxx
+
  wxscintilla_LexSQL.o: $(srcdir)/src/stc/scintilla/src/LexSQL.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexSQL.cxx
  
  wxscintilla_LexSQL.o: $(srcdir)/src/stc/scintilla/src/LexSQL.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexSQL.cxx
  
+wxscintilla_LexScriptol.o: $(srcdir)/src/stc/scintilla/src/LexScriptol.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexScriptol.cxx
+
  wxscintilla_LexSmalltalk.o: $(srcdir)/src/stc/scintilla/src/LexSmalltalk.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexSmalltalk.cxx
  
  wxscintilla_LexSmalltalk.o: $(srcdir)/src/stc/scintilla/src/LexSmalltalk.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexSmalltalk.cxx
  
-wxscintilla_LexTADS3.o: $(srcdir)/src/stc/scintilla/src/LexTADS3.cxx
-       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexTADS3.cxx
-
-wxscintilla_LexScriptol.o: $(srcdir)/src/stc/scintilla/src/LexScriptol.cxx
-       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexScriptol.cxx
+wxscintilla_LexSorcus.o: $(srcdir)/src/stc/scintilla/src/LexSorcus.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexSorcus.cxx
  
  wxscintilla_LexSpecman.o: $(srcdir)/src/stc/scintilla/src/LexSpecman.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexSpecman.cxx
  
  wxscintilla_LexSpecman.o: $(srcdir)/src/stc/scintilla/src/LexSpecman.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexSpecman.cxx
@@ -13695,6 +15509,15 @@ wxscintilla_LexSpecman.o: $(srcdir)/src/stc/scintilla/src/LexSpecman.cxx
  wxscintilla_LexSpice.o: $(srcdir)/src/stc/scintilla/src/LexSpice.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexSpice.cxx
  
  wxscintilla_LexSpice.o: $(srcdir)/src/stc/scintilla/src/LexSpice.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexSpice.cxx
  
+wxscintilla_LexTACL.o: $(srcdir)/src/stc/scintilla/src/LexTACL.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexTACL.cxx
+
+wxscintilla_LexTADS3.o: $(srcdir)/src/stc/scintilla/src/LexTADS3.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexTADS3.cxx
+
+wxscintilla_LexTAL.o: $(srcdir)/src/stc/scintilla/src/LexTAL.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexTAL.cxx
+
  wxscintilla_LexTCL.o: $(srcdir)/src/stc/scintilla/src/LexTCL.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexTCL.cxx
  
  wxscintilla_LexTCL.o: $(srcdir)/src/stc/scintilla/src/LexTCL.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexTCL.cxx
  
@@ -13716,6 +15539,9 @@ wxscintilla_LexYAML.o: $(srcdir)/src/stc/scintilla/src/LexYAML.cxx
  wxscintilla_LineMarker.o: $(srcdir)/src/stc/scintilla/src/LineMarker.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LineMarker.cxx
  
  wxscintilla_LineMarker.o: $(srcdir)/src/stc/scintilla/src/LineMarker.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LineMarker.cxx
  
+wxscintilla_PerLine.o: $(srcdir)/src/stc/scintilla/src/PerLine.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/PerLine.cxx
+
  wxscintilla_PositionCache.o: $(srcdir)/src/stc/scintilla/src/PositionCache.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/PositionCache.cxx
  
  wxscintilla_PositionCache.o: $(srcdir)/src/stc/scintilla/src/PositionCache.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/PositionCache.cxx
  
@@ -13731,6 +15557,9 @@ wxscintilla_RunStyles.o: $(srcdir)/src/stc/scintilla/src/RunStyles.cxx
  wxscintilla_ScintillaBase.o: $(srcdir)/src/stc/scintilla/src/ScintillaBase.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/ScintillaBase.cxx
  
  wxscintilla_ScintillaBase.o: $(srcdir)/src/stc/scintilla/src/ScintillaBase.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/ScintillaBase.cxx
  
+wxscintilla_Selection.o: $(srcdir)/src/stc/scintilla/src/Selection.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/Selection.cxx
+
  wxscintilla_Style.o: $(srcdir)/src/stc/scintilla/src/Style.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/Style.cxx
  
  wxscintilla_Style.o: $(srcdir)/src/stc/scintilla/src/Style.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/Style.cxx
  
@@ -13749,6 +15578,9 @@ wxscintilla_WindowAccessor.o: $(srcdir)/src/stc/scintilla/src/WindowAccessor.cxx
  wxscintilla_XPM.o: $(srcdir)/src/stc/scintilla/src/XPM.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/XPM.cxx
  
  wxscintilla_XPM.o: $(srcdir)/src/stc/scintilla/src/XPM.cxx
         $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/XPM.cxx
  
+monodll_any.o: $(srcdir)/src/common/any.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/any.cpp
+
  monodll_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/appbase.cpp
  
  monodll_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/appbase.cpp
  
@@ -13782,6 +15614,9 @@ monodll_convauto.o: $(srcdir)/src/common/convauto.cpp $(MONODLL_ODEP)
  monodll_datetime.o: $(srcdir)/src/common/datetime.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/datetime.cpp
  
  monodll_datetime.o: $(srcdir)/src/common/datetime.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/datetime.cpp
  
+monodll_datetimefmt.o: $(srcdir)/src/common/datetimefmt.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/datetimefmt.cpp
+
  monodll_datstrm.o: $(srcdir)/src/common/datstrm.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/datstrm.cpp
  
  monodll_datstrm.o: $(srcdir)/src/common/datstrm.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/datstrm.cpp
  
@@ -13857,6 +15692,9 @@ monodll_intl.o: $(srcdir)/src/common/intl.cpp $(MONODLL_ODEP)
  monodll_ipcbase.o: $(srcdir)/src/common/ipcbase.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/ipcbase.cpp
  
  monodll_ipcbase.o: $(srcdir)/src/common/ipcbase.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/ipcbase.cpp
  
+monodll_languageinfo.o: $(srcdir)/src/common/languageinfo.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/languageinfo.cpp
+
  monodll_list.o: $(srcdir)/src/common/list.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/list.cpp
  
  monodll_list.o: $(srcdir)/src/common/list.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/list.cpp
  
@@ -13878,6 +15716,9 @@ monodll_module.o: $(srcdir)/src/common/module.cpp $(MONODLL_ODEP)
  monodll_mstream.o: $(srcdir)/src/common/mstream.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/mstream.cpp
  
  monodll_mstream.o: $(srcdir)/src/common/mstream.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/mstream.cpp
  
+monodll_numformatter.o: $(srcdir)/src/common/numformatter.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/numformatter.cpp
+
  monodll_object.o: $(srcdir)/src/common/object.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/object.cpp
  
  monodll_object.o: $(srcdir)/src/common/object.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/object.cpp
  
@@ -13899,6 +15740,9 @@ monodll_stdpbase.o: $(srcdir)/src/common/stdpbase.cpp $(MONODLL_ODEP)
  monodll_sstream.o: $(srcdir)/src/common/sstream.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/sstream.cpp
  
  monodll_sstream.o: $(srcdir)/src/common/sstream.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/sstream.cpp
  
+monodll_stdstream.o: $(srcdir)/src/common/stdstream.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/stdstream.cpp
+
  monodll_stopwatch.o: $(srcdir)/src/common/stopwatch.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/stopwatch.cpp
  
  monodll_stopwatch.o: $(srcdir)/src/common/stopwatch.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/stopwatch.cpp
  
@@ -13941,6 +15785,9 @@ monodll_timerimpl.o: $(srcdir)/src/common/timerimpl.cpp $(MONODLL_ODEP)
  monodll_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/tokenzr.cpp
  
  monodll_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/tokenzr.cpp
  
+monodll_translation.o: $(srcdir)/src/common/translation.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/translation.cpp
+
  monodll_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/txtstrm.cpp
  
  monodll_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/txtstrm.cpp
  
@@ -13980,6 +15827,18 @@ monodll_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp $(MONODLL_ODEP)
  monodll_zstream.o: $(srcdir)/src/common/zstream.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/zstream.cpp
  
  monodll_zstream.o: $(srcdir)/src/common/zstream.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/zstream.cpp
  
+monodll_fswatchercmn.o: $(srcdir)/src/common/fswatchercmn.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fswatchercmn.cpp
+
+monodll_fswatcherg.o: $(srcdir)/src/generic/fswatcherg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fswatcherg.cpp
+
+monodll_unix_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp
+
+monodll_fswatcher_inotify.o: $(srcdir)/src/unix/fswatcher_inotify.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fswatcher_inotify.cpp
+
  monodll_basemsw.o: $(srcdir)/src/msw/basemsw.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/basemsw.cpp
  
  monodll_basemsw.o: $(srcdir)/src/msw/basemsw.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/basemsw.cpp
  
@@ -13992,9 +15851,15 @@ monodll_debughlp.o: $(srcdir)/src/msw/debughlp.cpp $(MONODLL_ODEP)
  monodll_dde.o: $(srcdir)/src/msw/dde.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dde.cpp
  
  monodll_dde.o: $(srcdir)/src/msw/dde.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dde.cpp
  
+monodll_msw_dir.o: $(srcdir)/src/msw/dir.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dir.cpp
+
  monodll_dlmsw.o: $(srcdir)/src/msw/dlmsw.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dlmsw.cpp
  
  monodll_dlmsw.o: $(srcdir)/src/msw/dlmsw.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dlmsw.cpp
  
+monodll_msw_mimetype.o: $(srcdir)/src/msw/mimetype.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mimetype.cpp
+
  monodll_power.o: $(srcdir)/src/msw/power.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/power.cpp
  
  monodll_power.o: $(srcdir)/src/msw/power.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/power.cpp
  
@@ -14004,14 +15869,41 @@ monodll_regconf.o: $(srcdir)/src/msw/regconf.cpp $(MONODLL_ODEP)
  monodll_registry.o: $(srcdir)/src/msw/registry.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/registry.cpp
  
  monodll_registry.o: $(srcdir)/src/msw/registry.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/registry.cpp
  
+monodll_msw_snglinst.o: $(srcdir)/src/msw/snglinst.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/snglinst.cpp
+
+monodll_msw_stackwalk.o: $(srcdir)/src/msw/stackwalk.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/stackwalk.cpp
+
+monodll_msw_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/stdpaths.cpp
+
+monodll_msw_thread.o: $(srcdir)/src/msw/thread.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/thread.cpp
+
+monodll_msw_timer.o: $(srcdir)/src/msw/timer.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/timer.cpp
+
+monodll_msw_utils.o: $(srcdir)/src/msw/utils.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/utils.cpp
+
+monodll_msw_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/utilsexc.cpp
+
+monodll_fswatcher.o: $(srcdir)/src/msw/fswatcher.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fswatcher.cpp
+
  monodll_time.o: $(srcdir)/src/msw/wince/time.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/time.cpp
  
  monodll_time.o: $(srcdir)/src/msw/wince/time.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/time.cpp
  
+monodll_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp
+
  monodll_cfstring.o: $(srcdir)/src/osx/core/cfstring.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/cfstring.cpp
  
  monodll_cfstring.o: $(srcdir)/src/osx/core/cfstring.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/cfstring.cpp
  
-monodll_gsockosx.o: $(srcdir)/src/osx/core/gsockosx.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/gsockosx.cpp
+monodll_evtloop_cf.o: $(srcdir)/src/osx/core/evtloop_cf.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/evtloop_cf.cpp
  
  monodll_stdpaths_cf.o: $(srcdir)/src/osx/core/stdpaths_cf.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/stdpaths_cf.cpp
  
  monodll_stdpaths_cf.o: $(srcdir)/src/osx/core/stdpaths_cf.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/stdpaths_cf.cpp
@@ -14022,6 +15914,33 @@ monodll_strconv_cf.o: $(srcdir)/src/osx/core/strconv_cf.cpp $(MONODLL_ODEP)
  monodll_utilsexc_base.o: $(srcdir)/src/osx/core/utilsexc_base.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_base.cpp
  
  monodll_utilsexc_base.o: $(srcdir)/src/osx/core/utilsexc_base.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_base.cpp
  
+monodll_os2_dir.o: $(srcdir)/src/os2/dir.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dir.cpp
+
+monodll_os2_mimetype.o: $(srcdir)/src/os2/mimetype.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/mimetype.cpp
+
+monodll_os2_snglinst.o: $(srcdir)/src/os2/snglinst.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/snglinst.cpp
+
+monodll_os2_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/stdpaths.cpp
+
+monodll_os2_thread.o: $(srcdir)/src/os2/thread.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/thread.cpp
+
+monodll_os2_utils.o: $(srcdir)/src/os2/utils.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/utils.cpp
+
+monodll_os2_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/utilsexc.cpp
+
+monodll_msdos_dir.o: $(srcdir)/src/msdos/dir.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msdos/dir.cpp
+
+monodll_msdos_mimetype.o: $(srcdir)/src/msdos/mimetype.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msdos/mimetype.cpp
+
  monodll_utilsdos.o: $(srcdir)/src/msdos/utilsdos.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msdos/utilsdos.cpp
  
  monodll_utilsdos.o: $(srcdir)/src/msdos/utilsdos.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msdos/utilsdos.cpp
  
@@ -14037,15 +15956,27 @@ monodll_msgout.o: $(srcdir)/src/common/msgout.cpp $(MONODLL_ODEP)
  monodll_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/utilscmn.cpp
  
  monodll_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/utilscmn.cpp
  
+monodll_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
+
+monodll_msw_main.o: $(srcdir)/src/msw/main.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/main.cpp
+
  monodll_mslu.o: $(srcdir)/src/msw/mslu.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mslu.cpp
  
  monodll_volume.o: $(srcdir)/src/msw/volume.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/volume.cpp
  
  monodll_mslu.o: $(srcdir)/src/msw/mslu.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mslu.cpp
  
  monodll_volume.o: $(srcdir)/src/msw/volume.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/volume.cpp
  
+monodll_carbon_utils.o: $(srcdir)/src/osx/carbon/utils.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/utils.cpp
+
  monodll_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/uma.cpp
  
  monodll_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/uma.cpp
  
+monodll_osx_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm
+
  monodll_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp
  
  monodll_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp
  
@@ -14076,8 +16007,8 @@ monodll_socket.o: $(srcdir)/src/common/socket.cpp $(MONODLL_ODEP)
  monodll_url.o: $(srcdir)/src/common/url.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/url.cpp
  
  monodll_url.o: $(srcdir)/src/common/url.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/url.cpp
  
-monodll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gsockmsw.cpp
+monodll_sockmsw.o: $(srcdir)/src/msw/sockmsw.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/sockmsw.cpp
  
  monodll_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/urlmsw.cpp
  
  monodll_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/urlmsw.cpp
@@ -14085,3317 +16016,3107 @@ monodll_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(MONODLL_ODEP)
  monodll_net.o: $(srcdir)/src/msw/wince/net.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/net.cpp
  
  monodll_net.o: $(srcdir)/src/msw/wince/net.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/net.cpp
  
-monodll_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp
+monodll_sockosx.o: $(srcdir)/src/osx/core/sockosx.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/sockosx.cpp
+
+monodll_gtk_anybutton.o: $(srcdir)/src/gtk/anybutton.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/anybutton.cpp
  
  monodll_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp
  
  
  monodll_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp
  
+monodll_gtk_bmpbuttn.o: $(srcdir)/src/gtk/bmpbuttn.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/bmpbuttn.cpp
+
+monodll_gtk_button.o: $(srcdir)/src/gtk/button.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/button.cpp
+
+monodll_gtk_checkbox.o: $(srcdir)/src/gtk/checkbox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/checkbox.cpp
+
+monodll_gtk_checklst.o: $(srcdir)/src/gtk/checklst.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/checklst.cpp
+
+monodll_gtk_choice.o: $(srcdir)/src/gtk/choice.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/choice.cpp
+
  monodll_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp
  
  monodll_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp
  
+monodll_gtk_colordlg.o: $(srcdir)/src/gtk/colordlg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/colordlg.cpp
+
+monodll_gtk_combobox.o: $(srcdir)/src/gtk/combobox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/combobox.cpp
+
+monodll_gtk_control.o: $(srcdir)/src/gtk/control.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/control.cpp
+
  monodll_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp
  
  monodll_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp
  
+monodll_gtk_dialog.o: $(srcdir)/src/gtk/dialog.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dialog.cpp
+
  monodll_fontpicker.o: $(srcdir)/src/gtk/fontpicker.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/fontpicker.cpp
  
  monodll_filepicker.o: $(srcdir)/src/gtk/filepicker.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/filepicker.cpp
  
  monodll_fontpicker.o: $(srcdir)/src/gtk/fontpicker.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/fontpicker.cpp
  
  monodll_filepicker.o: $(srcdir)/src/gtk/filepicker.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/filepicker.cpp
  
+monodll_gtk_dirdlg.o: $(srcdir)/src/gtk/dirdlg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dirdlg.cpp
+
+monodll_gtk_filedlg.o: $(srcdir)/src/gtk/filedlg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/filedlg.cpp
+
+monodll_gtk_fontdlg.o: $(srcdir)/src/gtk/fontdlg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/fontdlg.cpp
+
+monodll_gtk_frame.o: $(srcdir)/src/gtk/frame.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/frame.cpp
+
+monodll_gtk_gauge.o: $(srcdir)/src/gtk/gauge.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/gauge.cpp
+
  monodll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/gnome/gprint.cpp
  
  monodll_gvfs.o: $(srcdir)/src/gtk/gnome/gvfs.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/gnome/gvfs.cpp
  
  monodll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/gnome/gprint.cpp
  
  monodll_gvfs.o: $(srcdir)/src/gtk/gnome/gvfs.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/gnome/gvfs.cpp
  
-monodll_mnemonics.o: $(srcdir)/src/gtk/mnemonics.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/mnemonics.cpp
+monodll_gtk_infobar.o: $(srcdir)/src/gtk/infobar.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/infobar.cpp
  
  
-monodll_treeentry_gtk.o: $(srcdir)/src/gtk/treeentry_gtk.c $(MONODLL_ODEP)
-       $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk/treeentry_gtk.c
+monodll_gtk_listbox.o: $(srcdir)/src/gtk/listbox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/listbox.cpp
  
  
-monodll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/bmpmotif.cpp
+monodll_gtk_mdi.o: $(srcdir)/src/gtk/mdi.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/mdi.cpp
  
  
-monodll_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/combobox_native.cpp
+monodll_gtk_menu.o: $(srcdir)/src/gtk/menu.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/menu.cpp
  
  
-monodll_gsockmot.o: $(srcdir)/src/motif/gsockmot.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/gsockmot.cpp
+monodll_gtk_mnemonics.o: $(srcdir)/src/gtk/mnemonics.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/mnemonics.cpp
  
  
-monodll_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(MONODLL_ODEP)
-       $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/motif/xmcombo/xmcombo.c
+monodll_gtk_msgdlg.o: $(srcdir)/src/gtk/msgdlg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/msgdlg.cpp
  
  
-monodll_choicece.o: $(srcdir)/src/msw/wince/choicece.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/choicece.cpp
+monodll_gtk_nativewin.o: $(srcdir)/src/gtk/nativewin.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/nativewin.cpp
  
  
-monodll_crt.o: $(srcdir)/src/msw/wince/crt.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/crt.cpp
+monodll_gtk_notebook.o: $(srcdir)/src/gtk/notebook.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/notebook.cpp
  
  
-monodll_filedlgwce.o: $(srcdir)/src/msw/wince/filedlgwce.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/filedlgwce.cpp
+monodll_gtk_print.o: $(srcdir)/src/gtk/print.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/print.cpp
  
  
-monodll_filefnwce.o: $(srcdir)/src/msw/wince/filefnwce.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/filefnwce.cpp
+monodll_gtk_radiobox.o: $(srcdir)/src/gtk/radiobox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/radiobox.cpp
  
  
-monodll_helpwce.o: $(srcdir)/src/msw/wince/helpwce.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/helpwce.cpp
+monodll_gtk_radiobut.o: $(srcdir)/src/gtk/radiobut.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/radiobut.cpp
  
  
-monodll_menuce.o: $(srcdir)/src/msw/wince/menuce.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/menuce.cpp
+monodll_gtk_scrolbar.o: $(srcdir)/src/gtk/scrolbar.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/scrolbar.cpp
  
  
-monodll_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/tbarwce.cpp
+monodll_gtk_scrolwin.o: $(srcdir)/src/gtk/scrolwin.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/scrolwin.cpp
  
  
-monodll_textctrlce.o: $(srcdir)/src/msw/wince/textctrlce.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/textctrlce.cpp
+monodll_gtk_slider.o: $(srcdir)/src/gtk/slider.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/slider.cpp
  
  
-monodll_listctrl_mac.o: $(srcdir)/src/osx/carbon/listctrl_mac.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/listctrl_mac.cpp
+monodll_gtk_spinbutt.o: $(srcdir)/src/gtk/spinbutt.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/spinbutt.cpp
  
  
-monodll_notebmac.o: $(srcdir)/src/osx/carbon/notebmac.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/notebmac.cpp
+monodll_gtk_spinctrl.o: $(srcdir)/src/gtk/spinctrl.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/spinctrl.cpp
  
  
-monodll_statlmac.o: $(srcdir)/src/osx/carbon/statlmac.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statlmac.cpp
+monodll_gtk_statbmp.o: $(srcdir)/src/gtk/statbmp.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/statbmp.cpp
  
  
-monodll_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm
+monodll_gtk_statbox.o: $(srcdir)/src/gtk/statbox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/statbox.cpp
  
  
-monodll_glcanvas.o: $(srcdir)/src/osx/cocoa/glcanvas.mm $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/glcanvas.mm
+monodll_gtk_statline.o: $(srcdir)/src/gtk/statline.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/statline.cpp
  
  
-monodll_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSBox.mm
+monodll_gtk_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/stattext.cpp
  
  
-monodll_NSButton.o: $(srcdir)/src/cocoa/NSButton.mm $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSButton.mm
+monodll_gtk_toolbar.o: $(srcdir)/src/gtk/toolbar.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/toolbar.cpp
  
  
-monodll_NSControl.o: $(srcdir)/src/cocoa/NSControl.mm $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSControl.mm
+monodll_gtk_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/textctrl.cpp
  
  
-monodll_NSMenu.o: $(srcdir)/src/cocoa/NSMenu.mm $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSMenu.mm
+monodll_gtk_textentry.o: $(srcdir)/src/gtk/textentry.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/textentry.cpp
  
  
-monodll_NSPanel.o: $(srcdir)/src/cocoa/NSPanel.mm $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSPanel.mm
+monodll_gtk_tglbtn.o: $(srcdir)/src/gtk/tglbtn.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/tglbtn.cpp
  
  
-monodll_NSScroller.o: $(srcdir)/src/cocoa/NSScroller.mm $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSScroller.mm
+monodll_treeentry_gtk.o: $(srcdir)/src/gtk/treeentry_gtk.c $(MONODLL_ODEP)
+       $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk/treeentry_gtk.c
  
  
-monodll_NSSlider.o: $(srcdir)/src/cocoa/NSSlider.mm $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSSlider.mm
+monodll_gtk1_bmpbuttn.o: $(srcdir)/src/gtk1/bmpbuttn.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/bmpbuttn.cpp
  
  
-monodll_NSTabView.o: $(srcdir)/src/cocoa/NSTabView.mm $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSTabView.mm
+monodll_gtk1_button.o: $(srcdir)/src/gtk1/button.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/button.cpp
  
  
-monodll_NSTableView.o: $(srcdir)/src/cocoa/NSTableView.mm $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSTableView.mm
+monodll_gtk1_checkbox.o: $(srcdir)/src/gtk1/checkbox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/checkbox.cpp
  
  
-monodll_NSTextField.o: $(srcdir)/src/cocoa/NSTextField.mm $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSTextField.mm
+monodll_gtk1_checklst.o: $(srcdir)/src/gtk1/checklst.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/checklst.cpp
  
  
-monodll_NSView.o: $(srcdir)/src/cocoa/NSView.mm $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSView.mm
+monodll_gtk1_choice.o: $(srcdir)/src/gtk1/choice.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/choice.cpp
  
  
-monodll_NSWindow.o: $(srcdir)/src/cocoa/NSWindow.mm $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/NSWindow.mm
+monodll_gtk1_combobox.o: $(srcdir)/src/gtk1/combobox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/combobox.cpp
  
  
-monodll_ObjcRef.o: $(srcdir)/src/cocoa/ObjcRef.mm $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/ObjcRef.mm
+monodll_gtk1_control.o: $(srcdir)/src/gtk1/control.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/control.cpp
  
  
-monodll_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/mbarman.mm
+monodll_gtk1_dialog.o: $(srcdir)/src/gtk1/dialog.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/dialog.cpp
  
  
-monodll_statline2.o: $(srcdir)/src/cocoa/statline2.mm $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/statline2.mm
+monodll_gtk1_filedlg.o: $(srcdir)/src/gtk1/filedlg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/filedlg.cpp
  
  
-monodll_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/gsockpm.cpp
+monodll_gtk1_fontdlg.o: $(srcdir)/src/gtk1/fontdlg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/fontdlg.cpp
  
  
-monodll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/ctrlrend.cpp
+monodll_gtk1_frame.o: $(srcdir)/src/gtk1/frame.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/frame.cpp
  
  
-monodll_framuniv.o: $(srcdir)/src/univ/framuniv.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/framuniv.cpp
+monodll_gtk1_gauge.o: $(srcdir)/src/gtk1/gauge.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/gauge.cpp
  
  
-monodll_inpcons.o: $(srcdir)/src/univ/inpcons.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/inpcons.cpp
+monodll_gtk1_listbox.o: $(srcdir)/src/gtk1/listbox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/listbox.cpp
  
  
-monodll_inphand.o: $(srcdir)/src/univ/inphand.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/inphand.cpp
+monodll_gtk1_mdi.o: $(srcdir)/src/gtk1/mdi.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/mdi.cpp
  
  
-monodll_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/scrarrow.cpp
+monodll_gtk1_menu.o: $(srcdir)/src/gtk1/menu.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/menu.cpp
  
  
-monodll_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/scrthumb.cpp
+monodll_gtk1_mnemonics.o: $(srcdir)/src/gtk1/mnemonics.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/mnemonics.cpp
  
  
-monodll_settingsuniv.o: $(srcdir)/src/univ/settingsuniv.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/settingsuniv.cpp
+monodll_gtk1_notebook.o: $(srcdir)/src/gtk1/notebook.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/notebook.cpp
  
  
-monodll_stdrend.o: $(srcdir)/src/univ/stdrend.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/stdrend.cpp
+monodll_gtk1_radiobox.o: $(srcdir)/src/gtk1/radiobox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/radiobox.cpp
  
  
-monodll_theme.o: $(srcdir)/src/univ/theme.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/theme.cpp
+monodll_gtk1_radiobut.o: $(srcdir)/src/gtk1/radiobut.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/radiobut.cpp
  
  
-monodll_topluniv.o: $(srcdir)/src/univ/topluniv.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/topluniv.cpp
+monodll_gtk1_scrolbar.o: $(srcdir)/src/gtk1/scrolbar.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/scrolbar.cpp
  
  
-monodll_winuniv.o: $(srcdir)/src/univ/winuniv.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/winuniv.cpp
+monodll_gtk1_scrolwin.o: $(srcdir)/src/gtk1/scrolwin.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/scrolwin.cpp
  
  
-monodll_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/themes/gtk.cpp
+monodll_gtk1_slider.o: $(srcdir)/src/gtk1/slider.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/slider.cpp
  
  
-monodll_metal.o: $(srcdir)/src/univ/themes/metal.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/themes/metal.cpp
+monodll_gtk1_spinbutt.o: $(srcdir)/src/gtk1/spinbutt.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/spinbutt.cpp
  
  
-monodll_mono.o: $(srcdir)/src/univ/themes/mono.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/themes/mono.cpp
+monodll_gtk1_spinctrl.o: $(srcdir)/src/gtk1/spinctrl.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/spinctrl.cpp
  
  
-monodll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/themes/win32.cpp
+monodll_gtk1_statbmp.o: $(srcdir)/src/gtk1/statbmp.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/statbmp.cpp
  
  
-monodll_animate.o: $(srcdir)/src/gtk/animate.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/animate.cpp
+monodll_gtk1_statbox.o: $(srcdir)/src/gtk1/statbox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/statbox.cpp
  
  
-monodll_hyperlink.o: $(srcdir)/src/gtk/hyperlink.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/hyperlink.cpp
+monodll_gtk1_statline.o: $(srcdir)/src/gtk1/statline.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/statline.cpp
  
  
-monodll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp
+monodll_gtk1_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp
  
  
-monodll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/helpbest.cpp
+monodll_gtk1_toolbar.o: $(srcdir)/src/gtk1/toolbar.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/toolbar.cpp
  
  
-monodll_helpctrl.o: $(srcdir)/src/html/helpctrl.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/helpctrl.cpp
+monodll_gtk1_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp
  
  
-monodll_helpdata.o: $(srcdir)/src/html/helpdata.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/helpdata.cpp
+monodll_gtk1_tglbtn.o: $(srcdir)/src/gtk1/tglbtn.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/tglbtn.cpp
  
  
-monodll_helpdlg.o: $(srcdir)/src/html/helpdlg.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/helpdlg.cpp
+monodll_motif_accel.o: $(srcdir)/src/motif/accel.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/accel.cpp
  
  
-monodll_helpfrm.o: $(srcdir)/src/html/helpfrm.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/helpfrm.cpp
+monodll_motif_app.o: $(srcdir)/src/motif/app.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/app.cpp
  
  
-monodll_helpwnd.o: $(srcdir)/src/html/helpwnd.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/helpwnd.cpp
+monodll_motif_bmpbuttn.o: $(srcdir)/src/motif/bmpbuttn.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/bmpbuttn.cpp
  
  
-monodll_htmlcell.o: $(srcdir)/src/html/htmlcell.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/htmlcell.cpp
+monodll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/bmpmotif.cpp
  
  
-monodll_htmlfilt.o: $(srcdir)/src/html/htmlfilt.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/htmlfilt.cpp
+monodll_motif_button.o: $(srcdir)/src/motif/button.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/button.cpp
  
  
-monodll_htmlpars.o: $(srcdir)/src/html/htmlpars.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/htmlpars.cpp
+monodll_motif_checkbox.o: $(srcdir)/src/motif/checkbox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/checkbox.cpp
  
  
-monodll_htmltag.o: $(srcdir)/src/html/htmltag.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/htmltag.cpp
+monodll_motif_checklst.o: $(srcdir)/src/motif/checklst.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/checklst.cpp
  
  
-monodll_htmlwin.o: $(srcdir)/src/html/htmlwin.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/htmlwin.cpp
+monodll_motif_choice.o: $(srcdir)/src/motif/choice.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/choice.cpp
  
  
-monodll_htmprint.o: $(srcdir)/src/html/htmprint.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/htmprint.cpp
+monodll_motif_clipbrd.o: $(srcdir)/src/motif/clipbrd.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/clipbrd.cpp
  
  
-monodll_m_dflist.o: $(srcdir)/src/html/m_dflist.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_dflist.cpp
+monodll_motif_colour.o: $(srcdir)/src/motif/colour.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/colour.cpp
  
  
-monodll_m_fonts.o: $(srcdir)/src/html/m_fonts.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_fonts.cpp
+monodll_motif_combobox.o: $(srcdir)/src/motif/combobox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/combobox.cpp
  
  
-monodll_m_hline.o: $(srcdir)/src/html/m_hline.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_hline.cpp
+monodll_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/combobox_native.cpp
  
  
-monodll_m_image.o: $(srcdir)/src/html/m_image.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_image.cpp
+monodll_motif_control.o: $(srcdir)/src/motif/control.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/control.cpp
  
  
-monodll_m_layout.o: $(srcdir)/src/html/m_layout.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_layout.cpp
+monodll_motif_cursor.o: $(srcdir)/src/motif/cursor.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/cursor.cpp
  
  
-monodll_m_links.o: $(srcdir)/src/html/m_links.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_links.cpp
+monodll_motif_data.o: $(srcdir)/src/motif/data.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/data.cpp
  
  
-monodll_m_list.o: $(srcdir)/src/html/m_list.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_list.cpp
+monodll_motif_dataobj.o: $(srcdir)/src/motif/dataobj.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dataobj.cpp
  
  
-monodll_m_pre.o: $(srcdir)/src/html/m_pre.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_pre.cpp
+monodll_motif_dc.o: $(srcdir)/src/motif/dc.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dc.cpp
  
  
-monodll_m_style.o: $(srcdir)/src/html/m_style.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_style.cpp
+monodll_motif_dcclient.o: $(srcdir)/src/motif/dcclient.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dcclient.cpp
  
  
-monodll_m_tables.o: $(srcdir)/src/html/m_tables.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_tables.cpp
+monodll_motif_dcmemory.o: $(srcdir)/src/motif/dcmemory.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dcmemory.cpp
  
  
-monodll_winpars.o: $(srcdir)/src/html/winpars.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/winpars.cpp
+monodll_motif_dcscreen.o: $(srcdir)/src/motif/dcscreen.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dcscreen.cpp
  
  
-monodll_htmllbox.o: $(srcdir)/src/generic/htmllbox.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/htmllbox.cpp
+monodll_motif_dialog.o: $(srcdir)/src/motif/dialog.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dialog.cpp
  
  
-monodll_debugrpt.o: $(srcdir)/src/common/debugrpt.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/debugrpt.cpp
+monodll_motif_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/evtloop.cpp
  
  
-monodll_dbgrptg.o: $(srcdir)/src/generic/dbgrptg.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dbgrptg.cpp
+monodll_motif_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/filedlg.cpp
  
  
-monodll_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp
+monodll_motif_font.o: $(srcdir)/src/motif/font.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/font.cpp
  
  
-monodll_xh_bmp.o: $(srcdir)/src/xrc/xh_bmp.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_bmp.cpp
+monodll_motif_frame.o: $(srcdir)/src/motif/frame.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/frame.cpp
  
  
-monodll_xh_bmpcbox.o: $(srcdir)/src/xrc/xh_bmpcbox.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_bmpcbox.cpp
+monodll_motif_gauge.o: $(srcdir)/src/motif/gauge.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp
  
  
-monodll_xh_bmpbt.o: $(srcdir)/src/xrc/xh_bmpbt.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_bmpbt.cpp
+monodll_sockmot.o: $(srcdir)/src/motif/sockmot.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/sockmot.cpp
  
  
-monodll_xh_bttn.o: $(srcdir)/src/xrc/xh_bttn.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_bttn.cpp
+monodll_motif_icon.o: $(srcdir)/src/motif/icon.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/icon.cpp
  
  
-monodll_xh_cald.o: $(srcdir)/src/xrc/xh_cald.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_cald.cpp
+monodll_motif_listbox.o: $(srcdir)/src/motif/listbox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/listbox.cpp
  
  
-monodll_xh_chckb.o: $(srcdir)/src/xrc/xh_chckb.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_chckb.cpp
+monodll_motif_main.o: $(srcdir)/src/motif/main.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/main.cpp
  
  
-monodll_xh_chckl.o: $(srcdir)/src/xrc/xh_chckl.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_chckl.cpp
+monodll_motif_menu.o: $(srcdir)/src/motif/menu.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/menu.cpp
  
  
-monodll_xh_choic.o: $(srcdir)/src/xrc/xh_choic.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_choic.cpp
+monodll_motif_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/menuitem.cpp
  
  
-monodll_xh_choicbk.o: $(srcdir)/src/xrc/xh_choicbk.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_choicbk.cpp
+monodll_motif_minifram.o: $(srcdir)/src/motif/minifram.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/minifram.cpp
  
  
-monodll_xh_clrpicker.o: $(srcdir)/src/xrc/xh_clrpicker.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_clrpicker.cpp
+monodll_motif_msgdlg.o: $(srcdir)/src/motif/msgdlg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/msgdlg.cpp
  
  
-monodll_xh_collpane.o: $(srcdir)/src/xrc/xh_collpane.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_collpane.cpp
+monodll_motif_popupwin.o: $(srcdir)/src/motif/popupwin.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/popupwin.cpp
  
  
-monodll_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp
+monodll_motif_radiobox.o: $(srcdir)/src/motif/radiobox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/radiobox.cpp
  
  
-monodll_xh_datectrl.o: $(srcdir)/src/xrc/xh_datectrl.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_datectrl.cpp
+monodll_motif_radiobut.o: $(srcdir)/src/motif/radiobut.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/radiobut.cpp
  
  
-monodll_xh_dirpicker.o: $(srcdir)/src/xrc/xh_dirpicker.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_dirpicker.cpp
+monodll_motif_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/scrolbar.cpp
  
  
-monodll_xh_dlg.o: $(srcdir)/src/xrc/xh_dlg.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_dlg.cpp
+monodll_motif_settings.o: $(srcdir)/src/motif/settings.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/settings.cpp
  
  
-monodll_xh_frame.o: $(srcdir)/src/xrc/xh_frame.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_frame.cpp
+monodll_motif_slider.o: $(srcdir)/src/motif/slider.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/slider.cpp
  
  
-monodll_xh_mdi.o: $(srcdir)/src/xrc/xh_mdi.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_mdi.cpp
+monodll_motif_spinbutt.o: $(srcdir)/src/motif/spinbutt.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/spinbutt.cpp
  
  
-monodll_xh_filepicker.o: $(srcdir)/src/xrc/xh_filepicker.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_filepicker.cpp
+monodll_motif_statbmp.o: $(srcdir)/src/motif/statbmp.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/statbmp.cpp
  
  
-monodll_xh_fontpicker.o: $(srcdir)/src/xrc/xh_fontpicker.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_fontpicker.cpp
+monodll_motif_statbox.o: $(srcdir)/src/motif/statbox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/statbox.cpp
  
  
-monodll_xh_gauge.o: $(srcdir)/src/xrc/xh_gauge.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_gauge.cpp
+monodll_motif_stattext.o: $(srcdir)/src/motif/stattext.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/stattext.cpp
  
  
-monodll_xh_gdctl.o: $(srcdir)/src/xrc/xh_gdctl.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_gdctl.cpp
+monodll_motif_textctrl.o: $(srcdir)/src/motif/textctrl.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/textctrl.cpp
  
  
-monodll_xh_grid.o: $(srcdir)/src/xrc/xh_grid.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_grid.cpp
+monodll_motif_textentry.o: $(srcdir)/src/motif/textentry.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/textentry.cpp
  
  
-monodll_xh_html.o: $(srcdir)/src/xrc/xh_html.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_html.cpp
+monodll_motif_timer.o: $(srcdir)/src/motif/timer.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/timer.cpp
  
  
-monodll_xh_hyperlink.o: $(srcdir)/src/xrc/xh_hyperlink.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_hyperlink.cpp
+monodll_motif_toolbar.o: $(srcdir)/src/motif/toolbar.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/toolbar.cpp
  
  
-monodll_xh_listb.o: $(srcdir)/src/xrc/xh_listb.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_listb.cpp
+monodll_motif_toplevel.o: $(srcdir)/src/motif/toplevel.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/toplevel.cpp
  
  
-monodll_xh_listbk.o: $(srcdir)/src/xrc/xh_listbk.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_listbk.cpp
+monodll_motif_utils.o: $(srcdir)/src/motif/utils.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/utils.cpp
  
  
-monodll_xh_listc.o: $(srcdir)/src/xrc/xh_listc.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_listc.cpp
+monodll_motif_window.o: $(srcdir)/src/motif/window.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/window.cpp
  
  
-monodll_xh_menu.o: $(srcdir)/src/xrc/xh_menu.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_menu.cpp
+monodll_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(MONODLL_ODEP)
+       $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/motif/xmcombo/xmcombo.c
  
  
-monodll_xh_notbk.o: $(srcdir)/src/xrc/xh_notbk.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_notbk.cpp
+monodll_generic_notebook.o: $(srcdir)/src/generic/notebook.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/notebook.cpp
  
  
-monodll_xh_odcombo.o: $(srcdir)/src/xrc/xh_odcombo.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_odcombo.cpp
+monodll_generic_statline.o: $(srcdir)/src/generic/statline.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statline.cpp
  
  
-monodll_xh_panel.o: $(srcdir)/src/xrc/xh_panel.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_panel.cpp
+monodll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
  
  
-monodll_xh_propdlg.o: $(srcdir)/src/xrc/xh_propdlg.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_propdlg.cpp
+monodll_msw_checklst.o: $(srcdir)/src/msw/checklst.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp
  
  
-monodll_xh_radbt.o: $(srcdir)/src/xrc/xh_radbt.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_radbt.cpp
+monodll_msw_fdrepdlg.o: $(srcdir)/src/msw/fdrepdlg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fdrepdlg.cpp
  
  
-monodll_xh_radbx.o: $(srcdir)/src/xrc/xh_radbx.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_radbx.cpp
+monodll_msw_fontdlg.o: $(srcdir)/src/msw/fontdlg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fontdlg.cpp
  
  
-monodll_xh_scrol.o: $(srcdir)/src/xrc/xh_scrol.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_scrol.cpp
+monodll_wince_checklst.o: $(srcdir)/src/msw/wince/checklst.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/checklst.cpp
  
  
-monodll_xh_scwin.o: $(srcdir)/src/xrc/xh_scwin.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_scwin.cpp
+monodll_choicece.o: $(srcdir)/src/msw/wince/choicece.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/choicece.cpp
  
  
-monodll_xh_htmllbox.o: $(srcdir)/src/xrc/xh_htmllbox.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_htmllbox.cpp
+monodll_crt.o: $(srcdir)/src/msw/wince/crt.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/crt.cpp
  
  
-monodll_xh_sizer.o: $(srcdir)/src/xrc/xh_sizer.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_sizer.cpp
+monodll_filedlgwce.o: $(srcdir)/src/msw/wince/filedlgwce.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/filedlgwce.cpp
  
  
-monodll_xh_slidr.o: $(srcdir)/src/xrc/xh_slidr.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_slidr.cpp
+monodll_filefnwce.o: $(srcdir)/src/msw/wince/filefnwce.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/filefnwce.cpp
  
  
-monodll_xh_spin.o: $(srcdir)/src/xrc/xh_spin.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_spin.cpp
+monodll_helpwce.o: $(srcdir)/src/msw/wince/helpwce.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/helpwce.cpp
  
  
-monodll_xh_split.o: $(srcdir)/src/xrc/xh_split.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_split.cpp
+monodll_menuce.o: $(srcdir)/src/msw/wince/menuce.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/menuce.cpp
  
  
-monodll_xh_srchctrl.o: $(srcdir)/src/xrc/xh_srchctrl.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_srchctrl.cpp
+monodll_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/tbarwce.cpp
  
  
-monodll_xh_statbar.o: $(srcdir)/src/xrc/xh_statbar.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_statbar.cpp
+monodll_textctrlce.o: $(srcdir)/src/msw/wince/textctrlce.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/textctrlce.cpp
  
  
-monodll_xh_stbmp.o: $(srcdir)/src/xrc/xh_stbmp.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_stbmp.cpp
+monodll_carbon_anybutton.o: $(srcdir)/src/osx/carbon/anybutton.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/anybutton.cpp
  
  
-monodll_xh_stbox.o: $(srcdir)/src/xrc/xh_stbox.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_stbox.cpp
+monodll_carbon_bmpbuttn.o: $(srcdir)/src/osx/carbon/bmpbuttn.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/bmpbuttn.cpp
  
  
-monodll_xh_stlin.o: $(srcdir)/src/xrc/xh_stlin.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_stlin.cpp
+monodll_carbon_button.o: $(srcdir)/src/osx/carbon/button.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/button.cpp
  
  
-monodll_xh_sttxt.o: $(srcdir)/src/xrc/xh_sttxt.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_sttxt.cpp
+monodll_carbon_checkbox.o: $(srcdir)/src/osx/carbon/checkbox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/checkbox.cpp
  
  
-monodll_xh_text.o: $(srcdir)/src/xrc/xh_text.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_text.cpp
+monodll_carbon_choice.o: $(srcdir)/src/osx/carbon/choice.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/choice.cpp
  
  
-monodll_xh_tglbtn.o: $(srcdir)/src/xrc/xh_tglbtn.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_tglbtn.cpp
+monodll_carbon_colordlg.o: $(srcdir)/src/osx/carbon/colordlg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlg.cpp
  
  
-monodll_xh_toolb.o: $(srcdir)/src/xrc/xh_toolb.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_toolb.cpp
+monodll_carbon_dialog.o: $(srcdir)/src/osx/carbon/dialog.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dialog.cpp
  
  
-monodll_xh_tree.o: $(srcdir)/src/xrc/xh_tree.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_tree.cpp
+monodll_carbon_dirdlg.o: $(srcdir)/src/osx/carbon/dirdlg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dirdlg.cpp
  
  
-monodll_xh_treebk.o: $(srcdir)/src/xrc/xh_treebk.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_treebk.cpp
+monodll_carbon_dnd.o: $(srcdir)/src/osx/carbon/dnd.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dnd.cpp
  
  
-monodll_xh_unkwn.o: $(srcdir)/src/xrc/xh_unkwn.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_unkwn.cpp
+monodll_carbon_evtloop.o: $(srcdir)/src/osx/carbon/evtloop.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/evtloop.cpp
  
  
-monodll_xh_wizrd.o: $(srcdir)/src/xrc/xh_wizrd.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_wizrd.cpp
+monodll_carbon_filedlg.o: $(srcdir)/src/osx/carbon/filedlg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/filedlg.cpp
  
  
-monodll_xmlres.o: $(srcdir)/src/xrc/xmlres.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xmlres.cpp
+monodll_carbon_gauge.o: $(srcdir)/src/osx/carbon/gauge.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gauge.cpp
  
  
-monodll_xmladv.o: $(srcdir)/src/xrc/xmladv.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xmladv.cpp
+monodll_carbon_listbox.o: $(srcdir)/src/osx/carbon/listbox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/listbox.cpp
  
  
-monodll_xmlrsall.o: $(srcdir)/src/xrc/xmlrsall.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xmlrsall.cpp
+monodll_listctrl_mac.o: $(srcdir)/src/osx/carbon/listctrl_mac.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/listctrl_mac.cpp
  
  
-monodll_framemanager.o: $(srcdir)/src/aui/framemanager.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/framemanager.cpp
+monodll_carbon_menu.o: $(srcdir)/src/osx/carbon/menu.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/menu.cpp
  
  
-monodll_dockart.o: $(srcdir)/src/aui/dockart.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/dockart.cpp
+monodll_carbon_menuitem.o: $(srcdir)/src/osx/carbon/menuitem.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/menuitem.cpp
  
  
-monodll_floatpane.o: $(srcdir)/src/aui/floatpane.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/floatpane.cpp
+monodll_carbon_msgdlg.o: $(srcdir)/src/osx/carbon/msgdlg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/msgdlg.cpp
  
  
-monodll_auibook.o: $(srcdir)/src/aui/auibook.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/auibook.cpp
+monodll_carbon_nonownedwnd.o: $(srcdir)/src/osx/carbon/nonownedwnd.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/nonownedwnd.cpp
  
  
-monodll_auibar.o: $(srcdir)/src/aui/auibar.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/auibar.cpp
+monodll_notebmac.o: $(srcdir)/src/osx/carbon/notebmac.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/notebmac.cpp
  
  
-monodll_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/tabmdi.cpp
+monodll_carbon_printdlg.o: $(srcdir)/src/osx/carbon/printdlg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/printdlg.cpp
  
  
-monodll_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp
+monodll_carbon_radiobut.o: $(srcdir)/src/osx/carbon/radiobut.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/radiobut.cpp
  
  
-monodll_richtextbuffer.o: $(srcdir)/src/richtext/richtextbuffer.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextbuffer.cpp
+monodll_carbon_scrolbar.o: $(srcdir)/src/osx/carbon/scrolbar.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/scrolbar.cpp
  
  
-monodll_richtextstyles.o: $(srcdir)/src/richtext/richtextstyles.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextstyles.cpp
+monodll_carbon_slider.o: $(srcdir)/src/osx/carbon/slider.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/slider.cpp
  
  
-monodll_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp
+monodll_carbon_spinbutt.o: $(srcdir)/src/osx/carbon/spinbutt.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/spinbutt.cpp
  
  
-monodll_richtexthtml.o: $(srcdir)/src/richtext/richtexthtml.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtexthtml.cpp
+monodll_carbon_srchctrl.o: $(srcdir)/src/osx/carbon/srchctrl.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/srchctrl.cpp
  
  
-monodll_richtextformatdlg.o: $(srcdir)/src/richtext/richtextformatdlg.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextformatdlg.cpp
+monodll_carbon_statbmp.o: $(srcdir)/src/osx/carbon/statbmp.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbmp.cpp
  
  
-monodll_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextsymboldlg.cpp
+monodll_carbon_statbox.o: $(srcdir)/src/osx/carbon/statbox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbox.cpp
  
  
-monodll_richtextstyledlg.o: $(srcdir)/src/richtext/richtextstyledlg.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextstyledlg.cpp
+monodll_statlmac.o: $(srcdir)/src/osx/carbon/statlmac.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statlmac.cpp
  
  
-monodll_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp
+monodll_carbon_stattext.o: $(srcdir)/src/osx/carbon/stattext.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/stattext.cpp
  
  
-monodll_stc.o: $(srcdir)/src/stc/stc.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/stc/stc.cpp
+monodll_carbon_textctrl.o: $(srcdir)/src/osx/carbon/textctrl.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/textctrl.cpp
  
  
-monodll_PlatWX.o: $(srcdir)/src/stc/PlatWX.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/stc/PlatWX.cpp
+monodll_carbon_tglbtn.o: $(srcdir)/src/osx/carbon/tglbtn.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tglbtn.cpp
  
  
-monodll_ScintillaWX.o: $(srcdir)/src/stc/ScintillaWX.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/stc/ScintillaWX.cpp
+monodll_carbon_toolbar.o: $(srcdir)/src/osx/carbon/toolbar.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/toolbar.cpp
  
  
-monodll_xml.o: $(srcdir)/src/xml/xml.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xml/xml.cpp
+monodll_carbon_tooltip.o: $(srcdir)/src/osx/carbon/tooltip.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tooltip.cpp
  
  
-monodll_xtixml.o: $(srcdir)/src/common/xtixml.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/xtixml.cpp
+monodll_carbon_window.o: $(srcdir)/src/osx/carbon/window.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/window.cpp
  
  
-monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound_sdl.cpp
+monodll_cocoa_anybutton.o: $(srcdir)/src/osx/cocoa/anybutton.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/anybutton.mm
  
  
-@COND_PLATFORM_UNIX_1@monodll_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp
+monodll_osx_cocoa_button.o: $(srcdir)/src/osx/cocoa/button.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/button.mm
  
  
-@COND_PLATFORM_MACOSX_1@monodll_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp
+monodll_osx_cocoa_checkbox.o: $(srcdir)/src/osx/cocoa/checkbox.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/checkbox.mm
  
  
-@COND_PLATFORM_OS2_1@monodll_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp
+monodll_osx_cocoa_choice.o: $(srcdir)/src/osx/cocoa/choice.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/choice.mm
  
  
-@COND_PLATFORM_UNIX_1@monodll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
+monodll_osx_cocoa_colour.o: $(srcdir)/src/osx/cocoa/colour.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/colour.mm
  
  
-@COND_PLATFORM_MACOSX_1@monodll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
+monodll_osx_cocoa_combobox.o: $(srcdir)/src/osx/cocoa/combobox.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/combobox.mm
  
  
-@COND_PLATFORM_OS2_1@monodll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
+monodll_osx_cocoa_dialog.o: $(srcdir)/src/osx/cocoa/dialog.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dialog.mm
  
  
-@COND_PLATFORM_UNIX_1@monodll_epolldispatcher.o: $(srcdir)/src/unix/epolldispatcher.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/epolldispatcher.cpp
+monodll_osx_cocoa_dirdlg.o: $(srcdir)/src/osx/cocoa/dirdlg.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dirdlg.mm
  
  
-@COND_PLATFORM_MACOSX_1@monodll_epolldispatcher.o: $(srcdir)/src/unix/epolldispatcher.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/epolldispatcher.cpp
+monodll_cocoa_dnd.o: $(srcdir)/src/osx/cocoa/dnd.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dnd.mm
  
  
-@COND_PLATFORM_UNIX_1@monodll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
+monodll_osx_cocoa_evtloop.o: $(srcdir)/src/osx/cocoa/evtloop.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/evtloop.mm
  
  
-@COND_PLATFORM_MACOSX_1@monodll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
+monodll_osx_cocoa_filedlg.o: $(srcdir)/src/osx/cocoa/filedlg.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/filedlg.mm
  
  
-@COND_PLATFORM_OS2_1@monodll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
+monodll_osx_cocoa_gauge.o: $(srcdir)/src/osx/cocoa/gauge.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/gauge.mm
  
  
-@COND_PLATFORM_UNIX_1@monodll_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
+monodll_osx_cocoa_listbox.o: $(srcdir)/src/osx/cocoa/listbox.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/listbox.mm
  
  
-@COND_PLATFORM_MACOSX_1@monodll_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
+monodll_osx_cocoa_menu.o: $(srcdir)/src/osx/cocoa/menu.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/menu.mm
  
  
-@COND_PLATFORM_OS2_1@monodll_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
+monodll_osx_cocoa_menuitem.o: $(srcdir)/src/osx/cocoa/menuitem.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/menuitem.mm
  
  
-@COND_PLATFORM_UNIX_1@monodll_dir.o: $(srcdir)/src/unix/dir.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dir.cpp
+monodll_osx_cocoa_msgdlg.o: $(srcdir)/src/osx/cocoa/msgdlg.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/msgdlg.mm
  
  
-@COND_PLATFORM_MACOSX_1@monodll_dir.o: $(srcdir)/src/unix/dir.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dir.cpp
+monodll_cocoa_nonownedwnd.o: $(srcdir)/src/osx/cocoa/nonownedwnd.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/nonownedwnd.mm
  
  
-@COND_PLATFORM_WIN32_1@monodll_dir.o: $(srcdir)/src/msw/dir.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dir.cpp
+monodll_osx_cocoa_notebook.o: $(srcdir)/src/osx/cocoa/notebook.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/notebook.mm
  
  
-@COND_PLATFORM_OS2_1@monodll_dir.o: $(srcdir)/src/os2/dir.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dir.cpp
+monodll_osx_cocoa_radiobut.o: $(srcdir)/src/osx/cocoa/radiobut.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/radiobut.mm
  
  
-@COND_PLATFORM_MSDOS_1@monodll_dir.o: $(srcdir)/src/msdos/dir.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MSDOS_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msdos/dir.cpp
+monodll_cocoa_printdlg.o: $(srcdir)/src/osx/cocoa/printdlg.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/printdlg.mm
  
  
-@COND_PLATFORM_UNIX_1@monodll_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
+monodll_osx_cocoa_scrolbar.o: $(srcdir)/src/osx/cocoa/scrolbar.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/scrolbar.mm
  
  
-@COND_PLATFORM_MACOSX_1@monodll_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
+monodll_osx_cocoa_slider.o: $(srcdir)/src/osx/cocoa/slider.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/slider.mm
  
  
-@COND_PLATFORM_UNIX_1@monodll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
+monodll_osx_cocoa_spinbutt.o: $(srcdir)/src/osx/cocoa/spinbutt.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/spinbutt.mm
  
  
-@COND_PLATFORM_MACOSX_1@monodll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
+monodll_cocoa_srchctrl.o: $(srcdir)/src/osx/cocoa/srchctrl.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/srchctrl.mm
  
  
-@COND_PLATFORM_WIN32_1@monodll_snglinst.o: $(srcdir)/src/msw/snglinst.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/snglinst.cpp
+monodll_osx_cocoa_statbox.o: $(srcdir)/src/osx/cocoa/statbox.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/statbox.mm
  
  
-@COND_PLATFORM_UNIX_1@monodll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/stdpaths.cpp
+monodll_cocoa_statline.o: $(srcdir)/src/osx/cocoa/statline.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/statline.mm
  
  
-@COND_PLATFORM_MACOSX_1@monodll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/stdpaths.cpp
+monodll_osx_cocoa_stattext.o: $(srcdir)/src/osx/cocoa/stattext.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/stattext.mm
  
  
-@COND_PLATFORM_WIN32_1@monodll_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/stdpaths.cpp
+monodll_osx_cocoa_textctrl.o: $(srcdir)/src/osx/cocoa/textctrl.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/textctrl.mm
  
  
-@COND_PLATFORM_OS2_1@monodll_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/stdpaths.cpp
+monodll_cocoa_tglbtn.o: $(srcdir)/src/osx/cocoa/tglbtn.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/tglbtn.mm
  
  
-@COND_PLATFORM_UNIX_1@monodll_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
+monodll_osx_cocoa_toolbar.o: $(srcdir)/src/osx/cocoa/toolbar.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/toolbar.mm
  
  
-@COND_PLATFORM_MACOSX_1@monodll_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
+monodll_osx_cocoa_tooltip.o: $(srcdir)/src/osx/cocoa/tooltip.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/tooltip.mm
  
  
-@COND_PLATFORM_OS2_1@monodll_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
+monodll_osx_cocoa_window.o: $(srcdir)/src/osx/cocoa/window.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/window.mm
  
  
-@COND_PLATFORM_UNIX_1@monodll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/threadpsx.cpp
+monodll_iphone_anybutton.o: $(srcdir)/src/osx/iphone/anybutton.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/anybutton.mm
  
  
-@COND_PLATFORM_MACOSX_1@monodll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/threadpsx.cpp
+monodll_iphone_button.o: $(srcdir)/src/osx/iphone/button.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/button.mm
  
  
-@COND_PLATFORM_UNIX_1@monodll_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/stackwalk.cpp
+monodll_iphone_checkbox.o: $(srcdir)/src/osx/iphone/checkbox.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/checkbox.mm
  
  
-@COND_PLATFORM_MACOSX_1@monodll_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/stackwalk.cpp
+monodll_iphone_dialog.o: $(srcdir)/src/osx/iphone/dialog.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/dialog.mm
  
  
-@COND_PLATFORM_WIN32_1@monodll_stackwalk.o: $(srcdir)/src/msw/stackwalk.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/stackwalk.cpp
+monodll_iphone_evtloop.o: $(srcdir)/src/osx/iphone/evtloop.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/evtloop.mm
  
  
-@COND_PLATFORM_UNIX_1@monodll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
+monodll_iphone_gauge.o: $(srcdir)/src/osx/iphone/gauge.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/gauge.mm
  
  
-@COND_PLATFORM_MACOSX_1@monodll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
+monodll_iphone_msgdlg.o: $(srcdir)/src/osx/iphone/msgdlg.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/msgdlg.mm
  
  
-@COND_PLATFORM_UNIX_1@monodll_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp
+monodll_iphone_nonownedwnd.o: $(srcdir)/src/osx/iphone/nonownedwnd.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/nonownedwnd.mm
  
  
-@COND_PLATFORM_WIN32_1@monodll_mimetype.o: $(srcdir)/src/msw/mimetype.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mimetype.cpp
+monodll_iphone_scrolbar.o: $(srcdir)/src/osx/iphone/scrolbar.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/scrolbar.mm
  
  
-@COND_PLATFORM_MACOSX_1@monodll_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp
+monodll_iphone_slider.o: $(srcdir)/src/osx/iphone/slider.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/slider.mm
  
  
-@COND_PLATFORM_OS2_1@monodll_mimetype.o: $(srcdir)/src/os2/mimetype.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/mimetype.cpp
+monodll_iphone_stattext.o: $(srcdir)/src/osx/iphone/stattext.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/stattext.mm
  
  
-@COND_PLATFORM_MSDOS_1@monodll_mimetype.o: $(srcdir)/src/msdos/mimetype.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MSDOS_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msdos/mimetype.cpp
+monodll_iphone_textctrl.o: $(srcdir)/src/osx/iphone/textctrl.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/textctrl.mm
  
  
-@COND_PLATFORM_UNIX_1@monodll_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
+monodll_iphone_toolbar.o: $(srcdir)/src/osx/iphone/toolbar.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/toolbar.mm
  
  
-@COND_PLATFORM_OS2_1@monodll_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
+monodll_iphone_utils.o: $(srcdir)/src/osx/iphone/utils.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/utils.mm
  
  
-@COND_PLATFORM_WIN32_1@monodll_thread.o: $(srcdir)/src/msw/thread.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/thread.cpp
+monodll_iphone_window.o: $(srcdir)/src/osx/iphone/window.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/window.mm
  
  
-@COND_PLATFORM_OS2_1@monodll_thread.o: $(srcdir)/src/os2/thread.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/thread.cpp
+monodll_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSBox.mm
  
  
-@COND_PLATFORM_WIN32_1@monodll_timer.o: $(srcdir)/src/msw/timer.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/timer.cpp
+monodll_NSButton.o: $(srcdir)/src/cocoa/NSButton.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSButton.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_timer.o: $(srcdir)/src/gtk/timer.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/timer.cpp
+monodll_NSControl.o: $(srcdir)/src/cocoa/NSControl.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSControl.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_timer.o: $(srcdir)/src/gtk1/timer.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/timer.cpp
+monodll_NSMenu.o: $(srcdir)/src/cocoa/NSMenu.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSMenu.mm
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_timer.o: $(srcdir)/src/osx/core/timer.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
+monodll_NSPanel.o: $(srcdir)/src/cocoa/NSPanel.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSPanel.mm
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_timer.o: $(srcdir)/src/osx/core/timer.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
+monodll_NSScroller.o: $(srcdir)/src/cocoa/NSScroller.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSScroller.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_timer.o: $(srcdir)/src/generic/timer.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
+monodll_NSSlider.o: $(srcdir)/src/cocoa/NSSlider.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSSlider.mm
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_timer.o: $(srcdir)/src/generic/timer.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
+monodll_NSTabView.o: $(srcdir)/src/cocoa/NSTabView.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSTabView.mm
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_timer.o: $(srcdir)/src/generic/timer.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
+monodll_NSTableView.o: $(srcdir)/src/cocoa/NSTableView.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSTableView.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_timer.o: $(srcdir)/src/motif/timer.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/timer.cpp
+monodll_NSTextField.o: $(srcdir)/src/cocoa/NSTextField.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSTextField.mm
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_timer.o: $(srcdir)/src/cocoa/timer.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/timer.mm
+monodll_NSView.o: $(srcdir)/src/cocoa/NSView.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSView.mm
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_timer.o: $(srcdir)/src/os2/timer.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/timer.cpp
+monodll_NSWindow.o: $(srcdir)/src/cocoa/NSWindow.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSWindow.mm
  
  
-@COND_PLATFORM_WIN32_1@monodll_utils.o: $(srcdir)/src/msw/utils.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/utils.cpp
+monodll_ObjcRef.o: $(srcdir)/src/cocoa/ObjcRef.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/ObjcRef.mm
  
  
-@COND_PLATFORM_OS2_1@monodll_utils.o: $(srcdir)/src/os2/utils.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/utils.cpp
+monodll_cocoa_app.o: $(srcdir)/src/cocoa/app.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/app.mm
  
  
-@COND_TOOLKIT_OSX_CARBON@monodll_utils.o: $(srcdir)/src/osx/carbon/utils.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/utils.cpp
+monodll_cocoa_bitmap.o: $(srcdir)/src/cocoa/bitmap.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/bitmap.mm
  
  
-@COND_TOOLKIT_OSX_COCOA@monodll_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm
+monodll_cocoa_bmpbuttn.o: $(srcdir)/src/cocoa/bmpbuttn.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/bmpbuttn.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_utils.o: $(srcdir)/src/x11/utils.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/utils.cpp
+monodll_cocoa_brush.o: $(srcdir)/src/cocoa/brush.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/brush.mm
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_utils.o: $(srcdir)/src/mgl/utils.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/utils.cpp
+monodll_src_cocoa_button.o: $(srcdir)/src/cocoa/button.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/button.mm
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_utils.o: $(srcdir)/src/dfb/utils.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/utils.cpp
+monodll_src_cocoa_checkbox.o: $(srcdir)/src/cocoa/checkbox.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/checkbox.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_utils.o: $(srcdir)/src/motif/utils.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/utils.cpp
+monodll_cocoa_checklst.o: $(srcdir)/src/cocoa/checklst.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/checklst.mm
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_utils.o: $(srcdir)/src/cocoa/utils.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/utils.mm
+monodll_src_cocoa_choice.o: $(srcdir)/src/cocoa/choice.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/choice.mm
  
  
-@COND_PLATFORM_WIN32_1@monodll_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/utilsexc.cpp
+monodll_cocoa_clipbrd.o: $(srcdir)/src/cocoa/clipbrd.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/clipbrd.mm
  
  
-@COND_PLATFORM_OS2_1@monodll_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/utilsexc.cpp
+monodll_cocoa_colordlg.o: $(srcdir)/src/cocoa/colordlg.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/colordlg.mm
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/utilsexc.mm
+monodll_src_cocoa_colour.o: $(srcdir)/src/cocoa/colour.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/colour.mm
  
  
-@COND_PLATFORM_WIN32_1@monodll_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
+monodll_src_cocoa_combobox.o: $(srcdir)/src/cocoa/combobox.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/combobox.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/evtloop.cpp
+monodll_cocoa_control.o: $(srcdir)/src/cocoa/control.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/control.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/gtk1/evtloop.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/evtloop.cpp
+monodll_cocoa_cursor.o: $(srcdir)/src/cocoa/cursor.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/cursor.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/x11/evtloop.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/evtloop.cpp
+monodll_cocoa_data.o: $(srcdir)/src/cocoa/data.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/data.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/evtloop.cpp
+monodll_cocoa_dataobj.o: $(srcdir)/src/cocoa/dataobj.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/dataobj.mm
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/dfb/evtloop.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/evtloop.cpp
+monodll_cocoa_dc.o: $(srcdir)/src/cocoa/dc.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/dc.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/evtloop.cpp
+monodll_cocoa_dcclient.o: $(srcdir)/src/cocoa/dcclient.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/dcclient.mm
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_evtloop.o: $(srcdir)/src/osx/carbon/evtloop.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/evtloop.cpp
+monodll_cocoa_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/dcmemory.mm
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_evtloop.o: $(srcdir)/src/osx/cocoa/evtloop.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/evtloop.mm
+monodll_cocoa_dcscreen.o: $(srcdir)/src/cocoa/dcscreen.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/dcscreen.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/evtloop.mm
+monodll_src_cocoa_dialog.o: $(srcdir)/src/cocoa/dialog.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/dialog.mm
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_evtloop.o: $(srcdir)/src/os2/evtloop.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/evtloop.cpp
+monodll_src_cocoa_dirdlg.o: $(srcdir)/src/cocoa/dirdlg.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/dirdlg.mm
  
  
-@COND_PLATFORM_WIN32_1@monodll_main.o: $(srcdir)/src/msw/main.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/main.cpp
+monodll_cocoa_display.o: $(srcdir)/src/cocoa/display.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/display.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_main.o: $(srcdir)/src/gtk1/main.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/main.cpp
+monodll_cocoa_drawer.o: $(srcdir)/src/cocoa/drawer.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/drawer.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_main.o: $(srcdir)/src/motif/main.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/main.cpp
+monodll_src_cocoa_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/evtloop.mm
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_main.o: $(srcdir)/src/cocoa/main.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/main.cpp
+monodll_src_cocoa_filedlg.o: $(srcdir)/src/cocoa/filedlg.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/filedlg.mm
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_main.o: $(srcdir)/src/os2/main.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/main.cpp
+monodll_cocoa_font.o: $(srcdir)/src/cocoa/font.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/font.mm
  
  
-@COND_PLATFORM_UNIX_1@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
+monodll_cocoa_fontdlg.o: $(srcdir)/src/cocoa/fontdlg.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/fontdlg.mm
  
  
-@COND_PLATFORM_MACOSX_1@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
+monodll_cocoa_fontenum.o: $(srcdir)/src/cocoa/fontenum.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/fontenum.mm
  
  
-@COND_PLATFORM_OS2_1@monodll_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
+monodll_cocoa_fontutil.o: $(srcdir)/src/cocoa/fontutil.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/fontutil.cpp
  
  
-@COND_PLATFORM_WIN32_1@monodll_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gsocket.cpp
+monodll_cocoa_frame.o: $(srcdir)/src/cocoa/frame.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/frame.mm
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monodll_src_cocoa_gauge.o: $(srcdir)/src/cocoa/gauge.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/gauge.mm
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monodll_cocoa_icon.o: $(srcdir)/src/cocoa/icon.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/icon.mm
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monodll_src_cocoa_listbox.o: $(srcdir)/src/cocoa/listbox.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/listbox.mm
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monodll_cocoa_main.o: $(srcdir)/src/cocoa/main.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/main.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monodll_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/mbarman.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monodll_cocoa_mdi.o: $(srcdir)/src/cocoa/mdi.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/mdi.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monodll_src_cocoa_menu.o: $(srcdir)/src/cocoa/menu.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/menu.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monodll_src_cocoa_menuitem.o: $(srcdir)/src/cocoa/menuitem.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/menuitem.mm
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monodll_src_cocoa_msgdlg.o: $(srcdir)/src/cocoa/msgdlg.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/msgdlg.mm
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monodll_src_cocoa_notebook.o: $(srcdir)/src/cocoa/notebook.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/notebook.mm
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_caret.o: $(srcdir)/src/msw/caret.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
+monodll_cocoa_pen.o: $(srcdir)/src/cocoa/pen.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/pen.mm
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_caret.o: $(srcdir)/src/msw/caret.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
+monodll_cocoa_radiobox.o: $(srcdir)/src/cocoa/radiobox.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/radiobox.mm
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+monodll_src_cocoa_radiobut.o: $(srcdir)/src/cocoa/radiobut.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/radiobut.mm
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+monodll_cocoa_region.o: $(srcdir)/src/cocoa/region.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/region.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+monodll_src_cocoa_scrolbar.o: $(srcdir)/src/cocoa/scrolbar.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/scrolbar.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+monodll_cocoa_settings.o: $(srcdir)/src/cocoa/settings.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/settings.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+monodll_src_cocoa_slider.o: $(srcdir)/src/cocoa/slider.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/slider.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+monodll_cocoa_sound.o: $(srcdir)/src/cocoa/sound.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/sound.mm
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+monodll_src_cocoa_spinbutt.o: $(srcdir)/src/cocoa/spinbutt.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/spinbutt.mm
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+monodll_cocoa_statbmp.o: $(srcdir)/src/cocoa/statbmp.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/statbmp.mm
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
+monodll_src_cocoa_statbox.o: $(srcdir)/src/cocoa/statbox.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/statbox.mm
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
+monodll_statline2.o: $(srcdir)/src/cocoa/statline2.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/statline2.mm
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
+monodll_src_cocoa_stattext.o: $(srcdir)/src/cocoa/stattext.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/stattext.mm
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
+monodll_src_cocoa_textctrl.o: $(srcdir)/src/cocoa/textctrl.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/textctrl.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+monodll_cocoa_timer.o: $(srcdir)/src/cocoa/timer.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/timer.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+monodll_src_cocoa_toolbar.o: $(srcdir)/src/cocoa/toolbar.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/toolbar.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+monodll_src_cocoa_tooltip.o: $(srcdir)/src/cocoa/tooltip.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/tooltip.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+monodll_cocoa_toplevel.o: $(srcdir)/src/cocoa/toplevel.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/toplevel.mm
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_dialup.o: $(srcdir)/src/msw/dialup.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
+monodll_src_cocoa_utils.o: $(srcdir)/src/cocoa/utils.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/utils.mm
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_dialup.o: $(srcdir)/src/msw/dialup.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
+monodll_cocoa_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/utilsexc.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
+monodll_src_cocoa_window.o: $(srcdir)/src/cocoa/window.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/window.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
+monodll_os2_accel.o: $(srcdir)/src/os2/accel.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/accel.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
+monodll_os2_app.o: $(srcdir)/src/os2/app.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/app.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
+monodll_os2_bitmap.o: $(srcdir)/src/os2/bitmap.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/bitmap.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
+monodll_os2_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/bmpbuttn.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
+monodll_os2_brush.o: $(srcdir)/src/os2/brush.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/brush.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
+monodll_os2_button.o: $(srcdir)/src/os2/button.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/button.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
+monodll_os2_checkbox.o: $(srcdir)/src/os2/checkbox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/checkbox.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_fontenum.o: $(srcdir)/src/mgl/fontenum.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/fontenum.cpp
+monodll_os2_checklst.o: $(srcdir)/src/os2/checklst.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/checklst.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_fontenum.o: $(srcdir)/src/dfb/fontenum.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/fontenum.cpp
+monodll_os2_choice.o: $(srcdir)/src/os2/choice.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/choice.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontenum.o: $(srcdir)/src/cocoa/fontenum.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/fontenum.mm
+monodll_os2_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/clipbrd.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_fontenum.o: $(srcdir)/src/os2/fontenum.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/fontenum.cpp
+monodll_os2_colour.o: $(srcdir)/src/os2/colour.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/colour.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
+monodll_os2_combobox.o: $(srcdir)/src/os2/combobox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/combobox.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
+monodll_os2_control.o: $(srcdir)/src/os2/control.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/control.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
+monodll_os2_cursor.o: $(srcdir)/src/os2/cursor.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/cursor.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
+monodll_os2_data.o: $(srcdir)/src/os2/data.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/data.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
+monodll_os2_dataobj.o: $(srcdir)/src/os2/dataobj.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dataobj.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
+monodll_os2_dc.o: $(srcdir)/src/os2/dc.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dc.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
+monodll_os2_dcclient.o: $(srcdir)/src/os2/dcclient.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dcclient.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
+monodll_os2_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dcmemory.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_fontutil.o: $(srcdir)/src/mgl/fontutil.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/fontutil.cpp
+monodll_os2_dcprint.o: $(srcdir)/src/os2/dcprint.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dcprint.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontutil.o: $(srcdir)/src/cocoa/fontutil.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/fontutil.cpp
+monodll_os2_dcscreen.o: $(srcdir)/src/os2/dcscreen.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dcscreen.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_fontutil.o: $(srcdir)/src/os2/fontutil.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/fontutil.cpp
+monodll_os2_dialog.o: $(srcdir)/src/os2/dialog.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dialog.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
+monodll_os2_dnd.o: $(srcdir)/src/os2/dnd.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dnd.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
+monodll_os2_evtloop.o: $(srcdir)/src/os2/evtloop.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/evtloop.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
+monodll_os2_filedlg.o: $(srcdir)/src/os2/filedlg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/filedlg.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
+monodll_os2_font.o: $(srcdir)/src/os2/font.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/font.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+monodll_os2_fontdlg.o: $(srcdir)/src/os2/fontdlg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/fontdlg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+monodll_os2_fontenum.o: $(srcdir)/src/os2/fontenum.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/fontenum.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+monodll_os2_fontutil.o: $(srcdir)/src/os2/fontutil.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/fontutil.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+monodll_os2_frame.o: $(srcdir)/src/os2/frame.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/frame.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+monodll_os2_gauge.o: $(srcdir)/src/os2/gauge.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/gauge.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+monodll_os2_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/gdiimage.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+monodll_sockpm.o: $(srcdir)/src/os2/sockpm.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/sockpm.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+monodll_os2_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/helpwin.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+monodll_os2_icon.o: $(srcdir)/src/os2/icon.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/icon.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_icon.o: $(srcdir)/src/msw/icon.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
+monodll_os2_iniconf.o: $(srcdir)/src/os2/iniconf.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/iniconf.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_icon.o: $(srcdir)/src/msw/icon.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
+monodll_os2_listbox.o: $(srcdir)/src/os2/listbox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/listbox.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_icon.o: $(srcdir)/src/motif/icon.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/icon.cpp
+monodll_os2_main.o: $(srcdir)/src/os2/main.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/main.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
+monodll_os2_menu.o: $(srcdir)/src/os2/menu.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/menu.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
+monodll_os2_menuitem.o: $(srcdir)/src/os2/menuitem.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/menuitem.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_icon.o: $(srcdir)/src/cocoa/icon.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/icon.mm
+monodll_os2_metafile.o: $(srcdir)/src/os2/metafile.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/metafile.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_icon.o: $(srcdir)/src/os2/icon.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/icon.cpp
+monodll_os2_minifram.o: $(srcdir)/src/os2/minifram.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/minifram.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
+monodll_os2_msgdlg.o: $(srcdir)/src/os2/msgdlg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/msgdlg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
+monodll_os2_nativdlg.o: $(srcdir)/src/os2/nativdlg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/nativdlg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
+monodll_os2_notebook.o: $(srcdir)/src/os2/notebook.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/notebook.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_app.o: $(srcdir)/src/gtk/app.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/app.cpp
+monodll_os2_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/ownerdrw.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_app.o: $(srcdir)/src/gtk1/app.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/app.cpp
+monodll_os2_palette.o: $(srcdir)/src/os2/palette.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/palette.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_app.o: $(srcdir)/src/msw/app.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/app.cpp
+monodll_os2_pen.o: $(srcdir)/src/os2/pen.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/pen.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_app.o: $(srcdir)/src/msw/app.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/app.cpp
+monodll_os2_popupwin.o: $(srcdir)/src/os2/popupwin.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/popupwin.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_app.o: $(srcdir)/src/x11/app.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/app.cpp
+monodll_os2_print.o: $(srcdir)/src/os2/print.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/print.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_app.o: $(srcdir)/src/mgl/app.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/app.cpp
+monodll_os2_radiobox.o: $(srcdir)/src/os2/radiobox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/radiobox.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_app.o: $(srcdir)/src/dfb/app.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/app.cpp
+monodll_os2_radiobut.o: $(srcdir)/src/os2/radiobut.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/radiobut.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_app.o: $(srcdir)/src/motif/app.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/app.cpp
+monodll_os2_region.o: $(srcdir)/src/os2/region.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/region.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_app.o: $(srcdir)/src/osx/carbon/app.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
+monodll_os2_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/scrolbar.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_app.o: $(srcdir)/src/osx/carbon/app.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
+monodll_os2_settings.o: $(srcdir)/src/os2/settings.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/settings.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_app.o: $(srcdir)/src/cocoa/app.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/app.mm
+monodll_os2_slider.o: $(srcdir)/src/os2/slider.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/slider.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_app.o: $(srcdir)/src/os2/app.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/app.cpp
+monodll_os2_spinbutt.o: $(srcdir)/src/os2/spinbutt.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/spinbutt.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.c $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.c
+monodll_os2_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/spinctrl.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/bitmap.cpp
+monodll_os2_statbmp.o: $(srcdir)/src/os2/statbmp.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/statbmp.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/gtk1/bitmap.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/bitmap.cpp
+monodll_os2_statbox.o: $(srcdir)/src/os2/statbox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/statbox.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
+monodll_os2_statline.o: $(srcdir)/src/os2/statline.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/statline.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
+monodll_os2_stattext.o: $(srcdir)/src/os2/stattext.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/stattext.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
+monodll_os2_textctrl.o: $(srcdir)/src/os2/textctrl.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/textctrl.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
+monodll_os2_textentry.o: $(srcdir)/src/os2/textentry.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/textentry.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
+monodll_os2_tglbtn.o: $(srcdir)/src/os2/tglbtn.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/tglbtn.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
+monodll_os2_timer.o: $(srcdir)/src/os2/timer.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/timer.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/bitmap.cpp
+monodll_os2_toolbar.o: $(srcdir)/src/os2/toolbar.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/toolbar.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_bitmap.o: $(srcdir)/src/dfb/bitmap.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/bitmap.cpp
+monodll_os2_tooltip.o: $(srcdir)/src/os2/tooltip.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/tooltip.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_bitmap.o: $(srcdir)/src/cocoa/bitmap.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/bitmap.mm
+monodll_os2_toplevel.o: $(srcdir)/src/os2/toplevel.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/toplevel.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_bitmap.o: $(srcdir)/src/os2/bitmap.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/bitmap.cpp
+monodll_os2_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/utilsgui.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_brush.o: $(srcdir)/src/gtk/brush.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/brush.cpp
+monodll_os2_window.o: $(srcdir)/src/os2/window.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/window.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_brush.o: $(srcdir)/src/gtk1/brush.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/brush.cpp
+monodll_univ_bmpbuttn.o: $(srcdir)/src/univ/bmpbuttn.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/bmpbuttn.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_brush.o: $(srcdir)/src/x11/brush.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
+monodll_univ_button.o: $(srcdir)/src/univ/button.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/button.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_brush.o: $(srcdir)/src/x11/brush.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
+monodll_univ_checkbox.o: $(srcdir)/src/univ/checkbox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/checkbox.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_brush.o: $(srcdir)/src/msw/brush.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
+monodll_univ_checklst.o: $(srcdir)/src/univ/checklst.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/checklst.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_brush.o: $(srcdir)/src/msw/brush.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
+monodll_univ_choice.o: $(srcdir)/src/univ/choice.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/choice.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_brush.o: $(srcdir)/src/osx/brush.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
+monodll_univ_combobox.o: $(srcdir)/src/univ/combobox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/combobox.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_brush.o: $(srcdir)/src/osx/brush.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
+monodll_univ_control.o: $(srcdir)/src/univ/control.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/control.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_brush.o: $(srcdir)/src/mgl/brush.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/brush.cpp
+monodll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/ctrlrend.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_brush.o: $(srcdir)/src/dfb/brush.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/brush.cpp
+monodll_univ_dialog.o: $(srcdir)/src/univ/dialog.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/dialog.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_brush.o: $(srcdir)/src/cocoa/brush.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/brush.mm
+monodll_framuniv.o: $(srcdir)/src/univ/framuniv.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/framuniv.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_brush.o: $(srcdir)/src/os2/brush.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/brush.cpp
+monodll_univ_gauge.o: $(srcdir)/src/univ/gauge.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/gauge.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_clipbrd.o: $(srcdir)/src/gtk/clipbrd.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/clipbrd.cpp
+monodll_inpcons.o: $(srcdir)/src/univ/inpcons.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/inpcons.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_clipbrd.o: $(srcdir)/src/gtk1/clipbrd.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/clipbrd.cpp
+monodll_inphand.o: $(srcdir)/src/univ/inphand.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/inphand.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
+monodll_univ_listbox.o: $(srcdir)/src/univ/listbox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/listbox.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
+monodll_univ_menu.o: $(srcdir)/src/univ/menu.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/menu.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_clipbrd.o: $(srcdir)/src/x11/clipbrd.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/clipbrd.cpp
+monodll_univ_notebook.o: $(srcdir)/src/univ/notebook.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/notebook.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_clipbrd.o: $(srcdir)/src/mgl/clipbrd.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/clipbrd.cpp
+monodll_univ_radiobox.o: $(srcdir)/src/univ/radiobox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/radiobox.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_clipbrd.o: $(srcdir)/src/motif/clipbrd.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/clipbrd.cpp
+monodll_univ_radiobut.o: $(srcdir)/src/univ/radiobut.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/radiobut.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
+monodll_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/scrarrow.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
+monodll_univ_scrolbar.o: $(srcdir)/src/univ/scrolbar.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/scrolbar.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_clipbrd.o: $(srcdir)/src/cocoa/clipbrd.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/clipbrd.mm
+monodll_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/scrthumb.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/clipbrd.cpp
+monodll_settingsuniv.o: $(srcdir)/src/univ/settingsuniv.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/settingsuniv.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_colour.o: $(srcdir)/src/gtk/colour.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/colour.cpp
+monodll_univ_slider.o: $(srcdir)/src/univ/slider.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/slider.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_colour.o: $(srcdir)/src/gtk1/colour.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/colour.cpp
+monodll_univ_spinbutt.o: $(srcdir)/src/univ/spinbutt.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/spinbutt.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_colour.o: $(srcdir)/src/msw/colour.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
+monodll_univ_statbmp.o: $(srcdir)/src/univ/statbmp.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/statbmp.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_colour.o: $(srcdir)/src/msw/colour.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
+monodll_univ_statbox.o: $(srcdir)/src/univ/statbox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/statbox.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_colour.o: $(srcdir)/src/osx/core/colour.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
+monodll_univ_statline.o: $(srcdir)/src/univ/statline.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/statline.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_colour.o: $(srcdir)/src/osx/core/colour.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
+monodll_univ_stattext.o: $(srcdir)/src/univ/stattext.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/stattext.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_colour.o: $(srcdir)/src/x11/colour.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/colour.cpp
+monodll_univ_statusbr.o: $(srcdir)/src/univ/statusbr.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/statusbr.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_colour.o: $(srcdir)/src/generic/colour.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
+monodll_stdrend.o: $(srcdir)/src/univ/stdrend.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/stdrend.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_colour.o: $(srcdir)/src/generic/colour.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
+monodll_univ_textctrl.o: $(srcdir)/src/univ/textctrl.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/textctrl.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_colour.o: $(srcdir)/src/motif/colour.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/colour.cpp
+monodll_univ_tglbtn.o: $(srcdir)/src/univ/tglbtn.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/tglbtn.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_colour.o: $(srcdir)/src/cocoa/colour.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/colour.mm
+monodll_theme.o: $(srcdir)/src/univ/theme.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/theme.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_colour.o: $(srcdir)/src/os2/colour.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/colour.cpp
+monodll_univ_toolbar.o: $(srcdir)/src/univ/toolbar.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/toolbar.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_cursor.o: $(srcdir)/src/gtk/cursor.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/cursor.cpp
+monodll_topluniv.o: $(srcdir)/src/univ/topluniv.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/topluniv.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_cursor.o: $(srcdir)/src/gtk1/cursor.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/cursor.cpp
+monodll_winuniv.o: $(srcdir)/src/univ/winuniv.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/winuniv.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_cursor.o: $(srcdir)/src/msw/cursor.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
+monodll_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/themes/gtk.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_cursor.o: $(srcdir)/src/msw/cursor.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
+monodll_metal.o: $(srcdir)/src/univ/themes/metal.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/themes/metal.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_cursor.o: $(srcdir)/src/x11/cursor.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/cursor.cpp
+monodll_mono.o: $(srcdir)/src/univ/themes/mono.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/themes/mono.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_cursor.o: $(srcdir)/src/mgl/cursor.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/cursor.cpp
+monodll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/themes/win32.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_cursor.o: $(srcdir)/src/dfb/cursor.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/cursor.cpp
+monodll_gtk_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_cursor.o: $(srcdir)/src/motif/cursor.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/cursor.cpp
+monodll_animate.o: $(srcdir)/src/gtk/animate.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/animate.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
+monodll_gtk_bmpcbox.o: $(srcdir)/src/gtk/bmpcbox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/bmpcbox.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
+monodll_gtk_calctrl.o: $(srcdir)/src/gtk/calctrl.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/calctrl.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_cursor.o: $(srcdir)/src/cocoa/cursor.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/cursor.mm
+monodll_gtk_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dataview.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_cursor.o: $(srcdir)/src/os2/cursor.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/cursor.cpp
+monodll_gtk_hyperlink.o: $(srcdir)/src/gtk/hyperlink.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/hyperlink.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_dataobj.o: $(srcdir)/src/gtk/dataobj.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dataobj.cpp
+monodll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_dataobj.o: $(srcdir)/src/gtk1/dataobj.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/dataobj.cpp
+monodll_carbon_mediactrl.o: $(srcdir)/src/osx/carbon/mediactrl.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/mediactrl.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
+monodll_cocoa_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/mediactrl.mm
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
+monodll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/helpbest.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_dataobj.o: $(srcdir)/src/x11/dataobj.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/dataobj.cpp
+monodll_helpctrl.o: $(srcdir)/src/html/helpctrl.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/helpctrl.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_dataobj.o: $(srcdir)/src/motif/dataobj.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dataobj.cpp
+monodll_helpdata.o: $(srcdir)/src/html/helpdata.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/helpdata.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
+monodll_helpdlg.o: $(srcdir)/src/html/helpdlg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/helpdlg.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
+monodll_helpfrm.o: $(srcdir)/src/html/helpfrm.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/helpfrm.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_dataobj.o: $(srcdir)/src/cocoa/dataobj.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/dataobj.mm
+monodll_helpwnd.o: $(srcdir)/src/html/helpwnd.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/helpwnd.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dataobj.o: $(srcdir)/src/os2/dataobj.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dataobj.cpp
+monodll_htmlcell.o: $(srcdir)/src/html/htmlcell.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/htmlcell.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_dc.o: $(srcdir)/src/gtk/dc.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dc.cpp
+monodll_htmlfilt.o: $(srcdir)/src/html/htmlfilt.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/htmlfilt.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_dc.o: $(srcdir)/src/gtk1/dc.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/dc.cpp
+monodll_htmlpars.o: $(srcdir)/src/html/htmlpars.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/htmlpars.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_dc.o: $(srcdir)/src/msw/dc.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
+monodll_htmltag.o: $(srcdir)/src/html/htmltag.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/htmltag.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_dc.o: $(srcdir)/src/msw/dc.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
+monodll_htmlwin.o: $(srcdir)/src/html/htmlwin.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/htmlwin.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_dc.o: $(srcdir)/src/x11/dc.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/dc.cpp
+monodll_htmprint.o: $(srcdir)/src/html/htmprint.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/htmprint.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_dc.o: $(srcdir)/src/mgl/dc.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/dc.cpp
+monodll_m_dflist.o: $(srcdir)/src/html/m_dflist.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_dflist.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dc.o: $(srcdir)/src/dfb/dc.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/dc.cpp
+monodll_m_fonts.o: $(srcdir)/src/html/m_fonts.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_fonts.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_dc.o: $(srcdir)/src/motif/dc.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dc.cpp
+monodll_m_hline.o: $(srcdir)/src/html/m_hline.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_hline.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_dc.o: $(srcdir)/src/cocoa/dc.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/dc.mm
+monodll_m_image.o: $(srcdir)/src/html/m_image.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_image.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dc.o: $(srcdir)/src/os2/dc.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dc.cpp
+monodll_m_layout.o: $(srcdir)/src/html/m_layout.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_layout.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_dcclient.o: $(srcdir)/src/gtk/dcclient.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dcclient.cpp
+monodll_m_links.o: $(srcdir)/src/html/m_links.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_links.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_dcclient.o: $(srcdir)/src/gtk1/dcclient.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/dcclient.cpp
+monodll_m_list.o: $(srcdir)/src/html/m_list.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_list.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
+monodll_m_pre.o: $(srcdir)/src/html/m_pre.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_pre.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
+monodll_m_span.o: $(srcdir)/src/html/m_span.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_span.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_dcclient.o: $(srcdir)/src/x11/dcclient.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/dcclient.cpp
+monodll_m_style.o: $(srcdir)/src/html/m_style.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_style.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/dcclient.cpp
+monodll_m_tables.o: $(srcdir)/src/html/m_tables.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/m_tables.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dcclient.o: $(srcdir)/src/dfb/dcclient.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/dcclient.cpp
+monodll_styleparams.o: $(srcdir)/src/html/styleparams.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/styleparams.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_dcclient.o: $(srcdir)/src/motif/dcclient.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dcclient.cpp
+monodll_winpars.o: $(srcdir)/src/html/winpars.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/winpars.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
+monodll_htmllbox.o: $(srcdir)/src/generic/htmllbox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/htmllbox.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
+monodll_webview_ie.o: $(srcdir)/src/msw/webview_ie.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/webview_ie.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_dcclient.o: $(srcdir)/src/cocoa/dcclient.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/dcclient.mm
+monodll_gtk_webview_webkit.o: $(srcdir)/src/gtk/webview_webkit.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dcclient.o: $(srcdir)/src/os2/dcclient.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dcclient.cpp
+monodll_osx_webview_webkit.o: $(srcdir)/src/osx/webview_webkit.mm $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/webview_webkit.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_dcmemory.o: $(srcdir)/src/gtk/dcmemory.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dcmemory.cpp
+monodll_webview.o: $(srcdir)/src/common/webview.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/webview.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_dcmemory.o: $(srcdir)/src/gtk1/dcmemory.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/dcmemory.cpp
+monodll_webviewarchivehandler.o: $(srcdir)/src/common/webviewarchivehandler.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/webviewarchivehandler.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
+monodll_debugrpt.o: $(srcdir)/src/common/debugrpt.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/debugrpt.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
+monodll_dbgrptg.o: $(srcdir)/src/generic/dbgrptg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dbgrptg.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
+monodll_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
+monodll_xh_bannerwindow.o: $(srcdir)/src/xrc/xh_bannerwindow.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_bannerwindow.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_dcmemory.o: $(srcdir)/src/x11/dcmemory.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/dcmemory.cpp
+monodll_xh_bmp.o: $(srcdir)/src/xrc/xh_bmp.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_bmp.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/dcmemory.cpp
+monodll_xh_bmpcbox.o: $(srcdir)/src/xrc/xh_bmpcbox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_bmpcbox.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dcmemory.o: $(srcdir)/src/dfb/dcmemory.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/dcmemory.cpp
+monodll_xh_bmpbt.o: $(srcdir)/src/xrc/xh_bmpbt.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_bmpbt.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_dcmemory.o: $(srcdir)/src/motif/dcmemory.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dcmemory.cpp
+monodll_xh_bttn.o: $(srcdir)/src/xrc/xh_bttn.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_bttn.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/dcmemory.mm
+monodll_xh_cald.o: $(srcdir)/src/xrc/xh_cald.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_cald.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dcmemory.cpp
+monodll_xh_chckb.o: $(srcdir)/src/xrc/xh_chckb.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_chckb.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_dcscreen.o: $(srcdir)/src/gtk/dcscreen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dcscreen.cpp
+monodll_xh_chckl.o: $(srcdir)/src/xrc/xh_chckl.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_chckl.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_dcscreen.o: $(srcdir)/src/gtk1/dcscreen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/dcscreen.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
+monodll_xh_choic.o: $(srcdir)/src/xrc/xh_choic.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_choic.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
+monodll_xh_choicbk.o: $(srcdir)/src/xrc/xh_choicbk.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_choicbk.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_dcscreen.o: $(srcdir)/src/x11/dcscreen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/dcscreen.cpp
+monodll_xh_clrpicker.o: $(srcdir)/src/xrc/xh_clrpicker.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_clrpicker.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_dcscreen.o: $(srcdir)/src/mgl/dcscreen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/dcscreen.cpp
+monodll_xh_cmdlinkbn.o: $(srcdir)/src/xrc/xh_cmdlinkbn.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_cmdlinkbn.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dcscreen.o: $(srcdir)/src/dfb/dcscreen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/dcscreen.cpp
+monodll_xh_collpane.o: $(srcdir)/src/xrc/xh_collpane.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_collpane.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_dcscreen.o: $(srcdir)/src/motif/dcscreen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dcscreen.cpp
+monodll_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
+monodll_xh_comboctrl.o: $(srcdir)/src/xrc/xh_comboctrl.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_comboctrl.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
+monodll_xh_datectrl.o: $(srcdir)/src/xrc/xh_datectrl.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_datectrl.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_dcscreen.o: $(srcdir)/src/cocoa/dcscreen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/dcscreen.cpp
+monodll_xh_dirpicker.o: $(srcdir)/src/xrc/xh_dirpicker.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_dirpicker.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dcscreen.o: $(srcdir)/src/os2/dcscreen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dcscreen.cpp
+monodll_xh_dlg.o: $(srcdir)/src/xrc/xh_dlg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_dlg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_dnd.o: $(srcdir)/src/gtk/dnd.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dnd.cpp
+monodll_xh_editlbox.o: $(srcdir)/src/xrc/xh_editlbox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_editlbox.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_dnd.o: $(srcdir)/src/gtk1/dnd.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/dnd.cpp
+monodll_xh_filectrl.o: $(srcdir)/src/xrc/xh_filectrl.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_filectrl.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_dnd.o: $(srcdir)/src/osx/carbon/dnd.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dnd.cpp
+monodll_xh_filepicker.o: $(srcdir)/src/xrc/xh_filepicker.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_filepicker.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_dnd.o: $(srcdir)/src/osx/carbon/dnd.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dnd.cpp
+monodll_xh_fontpicker.o: $(srcdir)/src/xrc/xh_fontpicker.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_fontpicker.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dnd.o: $(srcdir)/src/os2/dnd.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dnd.cpp
+monodll_xh_frame.o: $(srcdir)/src/xrc/xh_frame.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_frame.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_filectrl.o: $(srcdir)/src/gtk/filectrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/filectrl.cpp
+monodll_xh_gauge.o: $(srcdir)/src/xrc/xh_gauge.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_gauge.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_font.o: $(srcdir)/src/gtk/font.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/font.cpp
+monodll_xh_gdctl.o: $(srcdir)/src/xrc/xh_gdctl.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_gdctl.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_font.o: $(srcdir)/src/gtk1/font.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/font.cpp
+monodll_xh_grid.o: $(srcdir)/src/xrc/xh_grid.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_grid.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_font.o: $(srcdir)/src/msw/font.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/font.cpp
+monodll_xh_html.o: $(srcdir)/src/xrc/xh_html.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_html.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_font.o: $(srcdir)/src/msw/font.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/font.cpp
+monodll_xh_hyperlink.o: $(srcdir)/src/xrc/xh_hyperlink.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_hyperlink.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_font.o: $(srcdir)/src/x11/font.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/font.cpp
+monodll_xh_listb.o: $(srcdir)/src/xrc/xh_listb.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_listb.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_font.o: $(srcdir)/src/mgl/font.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/font.cpp
+monodll_xh_listbk.o: $(srcdir)/src/xrc/xh_listbk.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_listbk.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_font.o: $(srcdir)/src/dfb/font.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/font.cpp
+monodll_xh_listc.o: $(srcdir)/src/xrc/xh_listc.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_listc.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_font.o: $(srcdir)/src/motif/font.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/font.cpp
+monodll_xh_mdi.o: $(srcdir)/src/xrc/xh_mdi.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_mdi.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_font.o: $(srcdir)/src/osx/carbon/font.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
+monodll_xh_menu.o: $(srcdir)/src/xrc/xh_menu.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_menu.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_font.o: $(srcdir)/src/osx/carbon/font.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
+monodll_xh_notbk.o: $(srcdir)/src/xrc/xh_notbk.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_notbk.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_font.o: $(srcdir)/src/cocoa/font.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/font.mm
+monodll_xh_odcombo.o: $(srcdir)/src/xrc/xh_odcombo.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_odcombo.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_font.o: $(srcdir)/src/os2/font.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/font.cpp
+monodll_xh_panel.o: $(srcdir)/src/xrc/xh_panel.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_panel.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/gsockgtk.cpp
+monodll_xh_propdlg.o: $(srcdir)/src/xrc/xh_propdlg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_propdlg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gsockgtk.o: $(srcdir)/src/gtk1/gsockgtk.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/gsockgtk.cpp
+monodll_xh_radbt.o: $(srcdir)/src/xrc/xh_radbt.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_radbt.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_minifram.o: $(srcdir)/src/gtk/minifram.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/minifram.cpp
+monodll_xh_radbx.o: $(srcdir)/src/xrc/xh_radbx.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_radbx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_minifram.o: $(srcdir)/src/gtk1/minifram.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/minifram.cpp
+monodll_xh_scrol.o: $(srcdir)/src/xrc/xh_scrol.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_scrol.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_minifram.o: $(srcdir)/src/msw/minifram.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
+monodll_xh_scwin.o: $(srcdir)/src/xrc/xh_scwin.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_scwin.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_minifram.o: $(srcdir)/src/msw/minifram.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
+monodll_xh_htmllbox.o: $(srcdir)/src/xrc/xh_htmllbox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_htmllbox.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_minifram.o: $(srcdir)/src/osx/minifram.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
+monodll_xh_sizer.o: $(srcdir)/src/xrc/xh_sizer.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_sizer.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_minifram.o: $(srcdir)/src/osx/minifram.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
+monodll_xh_slidr.o: $(srcdir)/src/xrc/xh_slidr.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_slidr.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_minifram.o: $(srcdir)/src/x11/minifram.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/minifram.cpp
+monodll_xh_spin.o: $(srcdir)/src/xrc/xh_spin.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_spin.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_minifram.o: $(srcdir)/src/motif/minifram.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/minifram.cpp
+monodll_xh_split.o: $(srcdir)/src/xrc/xh_split.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_split.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_minifram.o: $(srcdir)/src/os2/minifram.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/minifram.cpp
+monodll_xh_srchctrl.o: $(srcdir)/src/xrc/xh_srchctrl.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_srchctrl.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_pen.o: $(srcdir)/src/gtk/pen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/pen.cpp
+monodll_xh_statbar.o: $(srcdir)/src/xrc/xh_statbar.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_statbar.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_pen.o: $(srcdir)/src/gtk1/pen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/pen.cpp
+monodll_xh_stbmp.o: $(srcdir)/src/xrc/xh_stbmp.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_stbmp.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_pen.o: $(srcdir)/src/x11/pen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
+monodll_xh_stbox.o: $(srcdir)/src/xrc/xh_stbox.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_stbox.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_pen.o: $(srcdir)/src/x11/pen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
+monodll_xh_stlin.o: $(srcdir)/src/xrc/xh_stlin.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_stlin.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_pen.o: $(srcdir)/src/msw/pen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
+monodll_xh_sttxt.o: $(srcdir)/src/xrc/xh_sttxt.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_sttxt.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_pen.o: $(srcdir)/src/msw/pen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
+monodll_xh_text.o: $(srcdir)/src/xrc/xh_text.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_text.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_pen.o: $(srcdir)/src/osx/pen.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
+monodll_xh_tglbtn.o: $(srcdir)/src/xrc/xh_tglbtn.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_tglbtn.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_pen.o: $(srcdir)/src/osx/pen.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
+monodll_xh_toolb.o: $(srcdir)/src/xrc/xh_toolb.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_toolb.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_pen.o: $(srcdir)/src/mgl/pen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/pen.cpp
+monodll_xh_toolbk.o: $(srcdir)/src/xrc/xh_toolbk.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_toolbk.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_pen.o: $(srcdir)/src/dfb/pen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/pen.cpp
+monodll_xh_tree.o: $(srcdir)/src/xrc/xh_tree.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_tree.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_pen.o: $(srcdir)/src/cocoa/pen.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/pen.mm
+monodll_xh_treebk.o: $(srcdir)/src/xrc/xh_treebk.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_treebk.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_pen.o: $(srcdir)/src/os2/pen.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/pen.cpp
+monodll_xh_unkwn.o: $(srcdir)/src/xrc/xh_unkwn.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_unkwn.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_popupwin.o: $(srcdir)/src/gtk/popupwin.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/popupwin.cpp
+monodll_xh_wizrd.o: $(srcdir)/src/xrc/xh_wizrd.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_wizrd.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_popupwin.o: $(srcdir)/src/gtk1/popupwin.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/popupwin.cpp
+monodll_xmlres.o: $(srcdir)/src/xrc/xmlres.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xmlres.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
+monodll_xmladv.o: $(srcdir)/src/xrc/xmladv.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xmladv.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
+monodll_xmlrsall.o: $(srcdir)/src/xrc/xmlrsall.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xmlrsall.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_popupwin.o: $(srcdir)/src/x11/popupwin.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/popupwin.cpp
+monodll_framemanager.o: $(srcdir)/src/aui/framemanager.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/framemanager.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_popupwin.o: $(srcdir)/src/motif/popupwin.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/popupwin.cpp
+monodll_dockart.o: $(srcdir)/src/aui/dockart.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/dockart.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
+monodll_floatpane.o: $(srcdir)/src/aui/floatpane.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/floatpane.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
+monodll_auibook.o: $(srcdir)/src/aui/auibook.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/auibook.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_popupwin.o: $(srcdir)/src/os2/popupwin.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/popupwin.cpp
+monodll_auibar.o: $(srcdir)/src/aui/auibar.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/auibar.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_private.o: $(srcdir)/src/gtk/private.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/private.cpp
+monodll_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/tabmdi.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_region.o: $(srcdir)/src/gtk/region.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/region.cpp
+monodll_advprops.o: $(srcdir)/src/propgrid/advprops.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/propgrid/advprops.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_region.o: $(srcdir)/src/gtk1/region.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/region.cpp
+monodll_editors.o: $(srcdir)/src/propgrid/editors.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/propgrid/editors.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_region.o: $(srcdir)/src/x11/region.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/region.cpp
+monodll_manager.o: $(srcdir)/src/propgrid/manager.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/propgrid/manager.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_region.o: $(srcdir)/src/x11/region.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/region.cpp
+monodll_property.o: $(srcdir)/src/propgrid/property.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/propgrid/property.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_region.o: $(srcdir)/src/msw/region.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/region.cpp
+monodll_propgrid.o: $(srcdir)/src/propgrid/propgrid.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/propgrid/propgrid.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_region.o: $(srcdir)/src/msw/region.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/region.cpp
+monodll_propgridiface.o: $(srcdir)/src/propgrid/propgridiface.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/propgrid/propgridiface.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_region.o: $(srcdir)/src/mgl/region.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/region.cpp
+monodll_propgridpagestate.o: $(srcdir)/src/propgrid/propgridpagestate.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/propgrid/propgridpagestate.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_region.o: $(srcdir)/src/dfb/region.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/region.cpp
+monodll_props.o: $(srcdir)/src/propgrid/props.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/propgrid/props.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_region.o: $(srcdir)/src/osx/carbon/region.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/region.cpp
+monodll_art_internal.o: $(srcdir)/src/ribbon/art_internal.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/ribbon/art_internal.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_region.o: $(srcdir)/src/cocoa/region.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/region.mm
+monodll_art_msw.o: $(srcdir)/src/ribbon/art_msw.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/ribbon/art_msw.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_region.o: $(srcdir)/src/os2/region.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/region.cpp
+monodll_art_aui.o: $(srcdir)/src/ribbon/art_aui.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/ribbon/art_aui.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_renderer.o: $(srcdir)/src/gtk/renderer.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/renderer.cpp
+monodll_bar.o: $(srcdir)/src/ribbon/bar.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/ribbon/bar.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_renderer.o: $(srcdir)/src/gtk1/renderer.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/renderer.cpp
+monodll_ribbon_buttonbar.o: $(srcdir)/src/ribbon/buttonbar.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/ribbon/buttonbar.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_renderer.o: $(srcdir)/src/msw/renderer.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
+monodll_ribbon_control.o: $(srcdir)/src/ribbon/control.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/ribbon/control.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_renderer.o: $(srcdir)/src/msw/renderer.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
+monodll_gallery.o: $(srcdir)/src/ribbon/gallery.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/ribbon/gallery.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
+monodll_page.o: $(srcdir)/src/ribbon/page.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/ribbon/page.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
+monodll_ribbon_panel.o: $(srcdir)/src/ribbon/panel.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/ribbon/panel.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_settings.o: $(srcdir)/src/gtk/settings.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/settings.cpp
+monodll_ribbon_toolbar.o: $(srcdir)/src/ribbon/toolbar.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/ribbon/toolbar.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_settings.o: $(srcdir)/src/gtk1/settings.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/settings.cpp
+monodll_richtextbuffer.o: $(srcdir)/src/richtext/richtextbuffer.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextbuffer.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_settings.o: $(srcdir)/src/msw/settings.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
+monodll_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_settings.o: $(srcdir)/src/msw/settings.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
+monodll_richtextformatdlg.o: $(srcdir)/src/richtext/richtextformatdlg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextformatdlg.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_settings.o: $(srcdir)/src/x11/settings.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/settings.cpp
+monodll_richtexthtml.o: $(srcdir)/src/richtext/richtexthtml.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtexthtml.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_settings.o: $(srcdir)/src/mgl/settings.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/settings.cpp
+monodll_richtextimagedlg.o: $(srcdir)/src/richtext/richtextimagedlg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextimagedlg.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_settings.o: $(srcdir)/src/dfb/settings.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/settings.cpp
+monodll_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_settings.o: $(srcdir)/src/motif/settings.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/settings.cpp
+monodll_richtextstyledlg.o: $(srcdir)/src/richtext/richtextstyledlg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextstyledlg.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
+monodll_richtextstyles.o: $(srcdir)/src/richtext/richtextstyles.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextstyles.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
+monodll_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextsymboldlg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_settings.o: $(srcdir)/src/cocoa/settings.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/settings.mm
+monodll_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_settings.o: $(srcdir)/src/os2/settings.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/settings.cpp
+monodll_stc.o: $(srcdir)/src/stc/stc.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/stc/stc.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_tooltip.o: $(srcdir)/src/gtk/tooltip.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/tooltip.cpp
+monodll_PlatWX.o: $(srcdir)/src/stc/PlatWX.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/stc/PlatWX.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_tooltip.o: $(srcdir)/src/gtk1/tooltip.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/tooltip.cpp
+monodll_ScintillaWX.o: $(srcdir)/src/stc/ScintillaWX.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/stc/ScintillaWX.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
+monodll_xml.o: $(srcdir)/src/xml/xml.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xml/xml.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
+monodll_xtixml.o: $(srcdir)/src/common/xtixml.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/xtixml.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_tooltip.o: $(srcdir)/src/osx/carbon/tooltip.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tooltip.cpp
+monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound_sdl.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_tooltip.o: $(srcdir)/src/osx/carbon/tooltip.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tooltip.cpp
+@COND_PLATFORM_UNIX_1@monodll_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_tooltip.o: $(srcdir)/src/cocoa/tooltip.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/tooltip.mm
+@COND_PLATFORM_MACOSX_1@monodll_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_tooltip.o: $(srcdir)/src/os2/tooltip.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/tooltip.cpp
+@COND_PLATFORM_OS2_1@monodll_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_toplevel.o: $(srcdir)/src/gtk/toplevel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/toplevel.cpp
+@COND_PLATFORM_UNIX_1@monodll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_toplevel.o: $(srcdir)/src/gtk1/toplevel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/toplevel.cpp
+@COND_PLATFORM_MACOSX_1@monodll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
+@COND_PLATFORM_OS2_1@monodll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
+@COND_PLATFORM_UNIX_1@monodll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_toplevel.o: $(srcdir)/src/x11/toplevel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/toplevel.cpp
+@COND_PLATFORM_MACOSX_1@monodll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_toplevel.o: $(srcdir)/src/mgl/toplevel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/toplevel.cpp
+@COND_PLATFORM_OS2_1@monodll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_toplevel.o: $(srcdir)/src/dfb/toplevel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/toplevel.cpp
+@COND_PLATFORM_UNIX_1@monodll_unix_dir.o: $(srcdir)/src/unix/dir.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dir.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_toplevel.o: $(srcdir)/src/motif/toplevel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/toplevel.cpp
+@COND_PLATFORM_MACOSX_1@monodll_unix_dir.o: $(srcdir)/src/unix/dir.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dir.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_toplevel.o: $(srcdir)/src/cocoa/toplevel.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/toplevel.mm
+@COND_PLATFORM_UNIX_1@monodll_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_toplevel.o: $(srcdir)/src/os2/toplevel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/toplevel.cpp
+@COND_PLATFORM_MACOSX_1@monodll_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_utilsgtk.o: $(srcdir)/src/gtk/utilsgtk.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/utilsgtk.cpp
+@COND_PLATFORM_UNIX_1@monodll_epolldispatcher.o: $(srcdir)/src/unix/epolldispatcher.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/epolldispatcher.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_utilsgtk.o: $(srcdir)/src/gtk1/utilsgtk.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/utilsgtk.cpp
+@COND_PLATFORM_MACOSX_1@monodll_epolldispatcher.o: $(srcdir)/src/unix/epolldispatcher.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/epolldispatcher.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_win_gtk.o: $(srcdir)/src/gtk/win_gtk.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/win_gtk.cpp
+@COND_PLATFORM_UNIX_1@monodll_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_win_gtk.o: $(srcdir)/src/gtk1/win_gtk.c $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk1/win_gtk.c
+@COND_PLATFORM_MACOSX_1@monodll_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_window.o: $(srcdir)/src/gtk/window.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/window.cpp
+@COND_PLATFORM_OS2_1@monodll_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_window.o: $(srcdir)/src/gtk1/window.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/window.cpp
+@COND_PLATFORM_UNIX_1@monodll_fdiounix.o: $(srcdir)/src/unix/fdiounix.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fdiounix.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_window.o: $(srcdir)/src/msw/window.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/window.cpp
+@COND_PLATFORM_MACOSX_1@monodll_fdiounix.o: $(srcdir)/src/unix/fdiounix.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fdiounix.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_window.o: $(srcdir)/src/msw/window.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/window.cpp
+@COND_PLATFORM_UNIX_1@monodll_unix_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_window.o: $(srcdir)/src/x11/window.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/window.cpp
+@COND_PLATFORM_MACOSX_1@monodll_unix_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_window.o: $(srcdir)/src/mgl/window.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/window.cpp
+@COND_PLATFORM_UNIX_1@monodll_unix_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/stackwalk.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_window.o: $(srcdir)/src/dfb/window.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/window.cpp
+@COND_PLATFORM_MACOSX_1@monodll_unix_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/stackwalk.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_window.o: $(srcdir)/src/motif/window.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/window.cpp
+@COND_PLATFORM_UNIX_1@monodll_unix_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/stdpaths.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_window.o: $(srcdir)/src/osx/carbon/window.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/window.cpp
+@COND_PLATFORM_MACOSX_1@monodll_unix_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/stdpaths.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_window.o: $(srcdir)/src/osx/cocoa/window.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/window.mm
+@COND_PLATFORM_UNIX_1@monodll_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_window.o: $(srcdir)/src/cocoa/window.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/window.mm
+@COND_PLATFORM_MACOSX_1@monodll_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_window.o: $(srcdir)/src/os2/window.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/window.cpp
+@COND_PLATFORM_OS2_1@monodll_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_data.o: $(srcdir)/src/gtk1/data.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/data.cpp
+@COND_PLATFORM_UNIX_1@monodll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/threadpsx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_data.o: $(srcdir)/src/msw/data.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/data.cpp
+@COND_PLATFORM_MACOSX_1@monodll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/threadpsx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_data.o: $(srcdir)/src/msw/data.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/data.cpp
+@COND_PLATFORM_UNIX_1@monodll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_data.o: $(srcdir)/src/x11/data.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/data.cpp
+@COND_PLATFORM_MACOSX_1@monodll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_data.o: $(srcdir)/src/mgl/data.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/data.cpp
+@COND_PLATFORM_UNIX_1@monodll_fswatcher_kqueue.o: $(srcdir)/src/unix/fswatcher_kqueue.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fswatcher_kqueue.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_data.o: $(srcdir)/src/motif/data.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/data.cpp
+@COND_PLATFORM_MACOSX_1@monodll_fswatcher_kqueue.o: $(srcdir)/src/unix/fswatcher_kqueue.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fswatcher_kqueue.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_data.o: $(srcdir)/src/cocoa/data.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/data.cpp
+@COND_PLATFORM_UNIX_1@monodll_socketiohandler.o: $(srcdir)/src/common/socketiohandler.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/socketiohandler.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_data.o: $(srcdir)/src/os2/data.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/data.cpp
+@COND_PLATFORM_MACOSX_1@monodll_socketiohandler.o: $(srcdir)/src/common/socketiohandler.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/socketiohandler.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_palette.o: $(srcdir)/src/x11/palette.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
+@COND_PLATFORM_UNIX_1@monodll_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_palette.o: $(srcdir)/src/x11/palette.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
+@COND_PLATFORM_MACOSX_1@monodll_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_palette.o: $(srcdir)/src/msw/palette.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
+@COND_PLATFORM_OS2_1@monodll_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_palette.o: $(srcdir)/src/msw/palette.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_palette.o: $(srcdir)/src/osx/palette.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_palette.o: $(srcdir)/src/osx/palette.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_palette.o: $(srcdir)/src/mgl/palette.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/palette.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_palette.o: $(srcdir)/src/os2/palette.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/palette.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dcprint.o: $(srcdir)/src/os2/dcprint.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dcprint.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_dib.o: $(srcdir)/src/msw/dib.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_dib.o: $(srcdir)/src/msw/dib.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_display.o: $(srcdir)/src/msw/display.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/display.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_display.o: $(srcdir)/src/msw/display.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/display.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_display.o: $(srcdir)/src/osx/core/display.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_display.o: $(srcdir)/src/osx/core/display.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_display.o: $(srcdir)/src/cocoa/display.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/display.mm
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/gdiimage.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_graphics.o: $(srcdir)/src/msw/graphics.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_graphics.o: $(srcdir)/src/msw/graphics.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/dropsrc.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/dropsrc.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_uiactionx11.o: $(srcdir)/src/unix/uiactionx11.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/uiactionx11.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_droptgt.o: $(srcdir)/src/msw/ole/droptgt.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/droptgt.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_uiactionx11.o: $(srcdir)/src/unix/uiactionx11.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/uiactionx11.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_droptgt.o: $(srcdir)/src/msw/ole/droptgt.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/droptgt.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_uiactionx11.o: $(srcdir)/src/unix/uiactionx11.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/uiactionx11.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_uiactionx11.o: $(srcdir)/src/unix/uiactionx11.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/uiactionx11.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_printdlg.o: $(srcdir)/src/osx/carbon/printdlg.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/printdlg.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_printdlg.o: $(srcdir)/src/osx/carbon/printdlg.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/printdlg.cpp
+@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_printwin.o: $(srcdir)/src/msw/printwin.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/printwin.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_printwin.o: $(srcdir)/src/msw/printwin.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/printwin.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/utilsgui.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_helpchm.o: $(srcdir)/src/msw/helpchm.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/helpchm.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_helpwin.o: $(srcdir)/src/msw/helpwin.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/helpwin.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_app.o: $(srcdir)/src/gtk/app.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/app.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/helpwin.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/automtn.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/bitmap.cpp
  
  
-@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) $(srcdir)/src/msw/ole/uuid.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_brush.o: $(srcdir)/src/gtk/brush.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/brush.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_accel.o: $(srcdir)/src/osx/accel.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_clipbrd.o: $(srcdir)/src/gtk/clipbrd.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/clipbrd.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_accel.o: $(srcdir)/src/osx/accel.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_colour.o: $(srcdir)/src/gtk/colour.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/colour.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_cursor.o: $(srcdir)/src/gtk/cursor.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/cursor.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_dataobj.o: $(srcdir)/src/gtk/dataobj.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dataobj.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_dc.o: $(srcdir)/src/gtk/dc.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dc.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monodll_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_dcclient.o: $(srcdir)/src/gtk/dcclient.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dcclient.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/motif/accel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/accel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_dcmemory.o: $(srcdir)/src/gtk/dcmemory.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dcmemory.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/msw/accel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_dcscreen.o: $(srcdir)/src/gtk/dcscreen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dcscreen.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/msw/accel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_dnd.o: $(srcdir)/src/gtk/dnd.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dnd.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_accel.o: $(srcdir)/src/os2/accel.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/accel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/evtloop.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_filectrl.o: $(srcdir)/src/gtk/filectrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/filectrl.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_filehistory.o: $(srcdir)/src/gtk/filehistory.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/filehistory.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_font.o: $(srcdir)/src/gtk/font.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/font.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_sockgtk.o: $(srcdir)/src/gtk/sockgtk.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/sockgtk.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_minifram.o: $(srcdir)/src/gtk/minifram.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/minifram.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_pen.o: $(srcdir)/src/gtk/pen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/pen.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_popupwin.o: $(srcdir)/src/gtk/popupwin.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/popupwin.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_private.o: $(srcdir)/src/gtk/private.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/private.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_region.o: $(srcdir)/src/gtk/region.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/region.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_renderer.o: $(srcdir)/src/gtk/renderer.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/renderer.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_settings.o: $(srcdir)/src/gtk/settings.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/settings.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_timer.o: $(srcdir)/src/gtk/timer.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/timer.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_tooltip.o: $(srcdir)/src/gtk/tooltip.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/tooltip.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_toplevel.o: $(srcdir)/src/gtk/toplevel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/toplevel.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_utilsgtk.o: $(srcdir)/src/gtk/utilsgtk.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/utilsgtk.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_win_gtk.o: $(srcdir)/src/gtk/win_gtk.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/win_gtk.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_window.o: $(srcdir)/src/gtk/window.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/window.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_app.o: $(srcdir)/src/gtk1/app.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/app.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_bitmap.o: $(srcdir)/src/gtk1/bitmap.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/bitmap.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_brush.o: $(srcdir)/src/gtk1/brush.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/brush.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_clipbrd.o: $(srcdir)/src/gtk1/clipbrd.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/clipbrd.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_colour.o: $(srcdir)/src/gtk1/colour.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/colour.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_cursor.o: $(srcdir)/src/gtk1/cursor.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/cursor.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_data.o: $(srcdir)/src/gtk1/data.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/data.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_dataobj.o: $(srcdir)/src/gtk1/dataobj.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/dataobj.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_dc.o: $(srcdir)/src/gtk1/dc.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/dc.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_dcclient.o: $(srcdir)/src/gtk1/dcclient.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/dcclient.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_dcmemory.o: $(srcdir)/src/gtk1/dcmemory.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/dcmemory.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_dcscreen.o: $(srcdir)/src/gtk1/dcscreen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/dcscreen.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_dnd.o: $(srcdir)/src/gtk1/dnd.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/dnd.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_evtloop.o: $(srcdir)/src/gtk1/evtloop.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/evtloop.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_font.o: $(srcdir)/src/gtk1/font.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/font.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_sockgtk.o: $(srcdir)/src/gtk1/sockgtk.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/sockgtk.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_main.o: $(srcdir)/src/gtk1/main.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/main.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_minifram.o: $(srcdir)/src/gtk1/minifram.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/minifram.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_pen.o: $(srcdir)/src/gtk1/pen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/pen.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_popupwin.o: $(srcdir)/src/gtk1/popupwin.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/popupwin.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_region.o: $(srcdir)/src/gtk1/region.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/region.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_renderer.o: $(srcdir)/src/gtk1/renderer.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/renderer.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_settings.o: $(srcdir)/src/gtk1/settings.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/settings.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_timer.o: $(srcdir)/src/gtk1/timer.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/timer.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_tooltip.o: $(srcdir)/src/gtk1/tooltip.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/tooltip.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_toplevel.o: $(srcdir)/src/gtk1/toplevel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/toplevel.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_utilsgtk.o: $(srcdir)/src/gtk1/utilsgtk.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/utilsgtk.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_win_gtk.o: $(srcdir)/src/gtk1/win_gtk.c $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk1/win_gtk.c
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_window.o: $(srcdir)/src/gtk1/window.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/window.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_tabctrl_osx.o: $(srcdir)/src/osx/tabctrl_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/tabctrl_osx.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_tabctrl_osx.o: $(srcdir)/src/osx/tabctrl_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/tabctrl_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_x11_brush.o: $(srcdir)/src/x11/brush.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_brush.o: $(srcdir)/src/x11/brush.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_x11_palette.o: $(srcdir)/src/x11/palette.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_palette.o: $(srcdir)/src/x11/palette.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_x11_pen.o: $(srcdir)/src/x11/pen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_pen.o: $(srcdir)/src/x11/pen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_x11_region.o: $(srcdir)/src/x11/region.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/region.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_region.o: $(srcdir)/src/x11/region.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/region.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_app.o: $(srcdir)/src/msw/app.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/app.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_app.o: $(srcdir)/src/msw/app.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/app.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_brush.o: $(srcdir)/src/msw/brush.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_brush.o: $(srcdir)/src/msw/brush.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_caret.o: $(srcdir)/src/msw/caret.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_caret.o: $(srcdir)/src/msw/caret.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_nanox.o: $(srcdir)/src/x11/nanox.c $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/x11/nanox.c
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_reparent.o: $(srcdir)/src/x11/reparent.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/reparent.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_colour.o: $(srcdir)/src/msw/colour.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_colour.o: $(srcdir)/src/msw/colour.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mask.o: $(srcdir)/src/generic/mask.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_cursor.o: $(srcdir)/src/msw/cursor.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_mask.o: $(srcdir)/src/generic/mask.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_cursor.o: $(srcdir)/src/msw/cursor.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/dirmgl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_data.o: $(srcdir)/src/msw/data.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/data.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_fontmgr.o: $(srcdir)/src/mgl/fontmgr.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/fontmgr.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_data.o: $(srcdir)/src/msw/data.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/data.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_fontmgr.o: $(srcdir)/src/dfb/fontmgr.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/fontmgr.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_dc.o: $(srcdir)/src/msw/dc.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_nonownedwnd.o: $(srcdir)/src/dfb/nonownedwnd.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/nonownedwnd.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_dc.o: $(srcdir)/src/msw/dc.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_nonownedwnd.o: $(srcdir)/src/osx/carbon/nonownedwnd.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/nonownedwnd.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_nonownedwnd.o: $(srcdir)/src/osx/cocoa/nonownedwnd.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/nonownedwnd.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_overlay.o: $(srcdir)/src/dfb/overlay.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/overlay.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monodll_wrapdfb.o: $(srcdir)/src/dfb/wrapdfb.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/wrapdfb.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
  
  
-@COND_PLATFORM_UNIX_1_USE_GUI_1@monodll_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
  
  
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@monodll_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_USE_GUI_1@     $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_dialup.o: $(srcdir)/src/msw/dialup.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_dialup.o: $(srcdir)/src/msw/dialup.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_dib.o: $(srcdir)/src/msw/dib.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_dib.o: $(srcdir)/src/msw/dib.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_display.o: $(srcdir)/src/msw/display.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/display.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_display.o: $(srcdir)/src/msw/display.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/display.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monodll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_font.o: $(srcdir)/src/msw/font.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/font.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_fdrepdlg.o: $(srcdir)/src/msw/fdrepdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fdrepdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_font.o: $(srcdir)/src/msw/font.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/font.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_graphics.o: $(srcdir)/src/msw/graphics.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_graphics.o: $(srcdir)/src/msw/graphics.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_icon.o: $(srcdir)/src/msw/icon.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_icon.o: $(srcdir)/src/msw/icon.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_minifram.o: $(srcdir)/src/msw/minifram.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monodll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_minifram.o: $(srcdir)/src/msw/minifram.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_ole_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_ole_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/dropsrc.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/dropsrc.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_droptgt.o: $(srcdir)/src/msw/ole/droptgt.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/droptgt.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_droptgt.o: $(srcdir)/src/msw/ole/droptgt.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/droptgt.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_palette.o: $(srcdir)/src/msw/palette.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_palette.o: $(srcdir)/src/msw/palette.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_pen.o: $(srcdir)/src/msw/pen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_pen.o: $(srcdir)/src/msw/pen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_printwin.o: $(srcdir)/src/msw/printwin.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/printwin.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_printwin.o: $(srcdir)/src/msw/printwin.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/printwin.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_region.o: $(srcdir)/src/msw/region.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/region.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_region.o: $(srcdir)/src/msw/region.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/region.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monodll_statusbr.o: $(srcdir)/src/univ/statusbr.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/statusbr.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_renderer.o: $(srcdir)/src/msw/renderer.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_renderer.o: $(srcdir)/src/msw/renderer.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_settings.o: $(srcdir)/src/msw/settings.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_settings.o: $(srcdir)/src/msw/settings.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monodll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_uiaction.o: $(srcdir)/src/msw/uiaction.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/uiaction.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_uiaction.o: $(srcdir)/src/msw/uiaction.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/uiaction.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_window.o: $(srcdir)/src/msw/window.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/window.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_window.o: $(srcdir)/src/msw/window.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/window.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_helpchm.o: $(srcdir)/src/msw/helpchm.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/helpchm.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_helpwin.o: $(srcdir)/src/msw/helpwin.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/helpwin.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/automtn.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monodll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
+@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) $(srcdir)/src/msw/ole/uuid.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/gtk/bmpbuttn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/bmpbuttn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/gtk1/bmpbuttn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/bmpbuttn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/motif/bmpbuttn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/bmpbuttn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monodll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_osx_brush.o: $(srcdir)/src/osx/brush.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_osx_brush.o: $(srcdir)/src/osx/brush.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/osx/carbon/bmpbuttn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/bmpbuttn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monodll_osx_brush.o: $(srcdir)/src/osx/brush.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/osx/cocoa/bmpbuttn.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/bmpbuttn.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/cocoa/bmpbuttn.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/bmpbuttn.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/bmpbuttn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monodll_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monodll_bmpbuttn.o: $(srcdir)/src/univ/bmpbuttn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/bmpbuttn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_osx_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_button.o: $(srcdir)/src/gtk/button.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/button.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_osx_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_button.o: $(srcdir)/src/gtk1/button.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/button.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monodll_osx_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_button.o: $(srcdir)/src/motif/button.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/button.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_osx_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_button.o: $(srcdir)/src/msw/button.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/button.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_osx_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_button.o: $(srcdir)/src/msw/button.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/button.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monodll_osx_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_button.o: $(srcdir)/src/osx/carbon/button.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/button.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_osx_minifram.o: $(srcdir)/src/osx/minifram.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_button.o: $(srcdir)/src/osx/cocoa/button.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/button.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_osx_minifram.o: $(srcdir)/src/osx/minifram.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_button.o: $(srcdir)/src/cocoa/button.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/button.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monodll_osx_minifram.o: $(srcdir)/src/osx/minifram.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_button.o: $(srcdir)/src/os2/button.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/button.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monodll_button.o: $(srcdir)/src/univ/button.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/button.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_checkbox.o: $(srcdir)/src/gtk/checkbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/checkbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monodll_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_checkbox.o: $(srcdir)/src/gtk1/checkbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/checkbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_osx_palette.o: $(srcdir)/src/osx/palette.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_checkbox.o: $(srcdir)/src/motif/checkbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/checkbox.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_osx_palette.o: $(srcdir)/src/osx/palette.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monodll_osx_palette.o: $(srcdir)/src/osx/palette.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_checkbox.o: $(srcdir)/src/osx/carbon/checkbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/checkbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_osx_pen.o: $(srcdir)/src/osx/pen.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_checkbox.o: $(srcdir)/src/osx/cocoa/checkbox.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/checkbox.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_osx_pen.o: $(srcdir)/src/osx/pen.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_checkbox.o: $(srcdir)/src/cocoa/checkbox.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/checkbox.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monodll_osx_pen.o: $(srcdir)/src/osx/pen.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_checkbox.o: $(srcdir)/src/os2/checkbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/checkbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monodll_checkbox.o: $(srcdir)/src/univ/checkbox.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/checkbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/gtk/checklst.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/checklst.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monodll_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/gtk1/checklst.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/checklst.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_uiaction_osx.o: $(srcdir)/src/osx/uiaction_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/uiaction_osx.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/motif/checklst.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/checklst.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_uiaction_osx.o: $(srcdir)/src/osx/uiaction_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/uiaction_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/msw/checklst.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monodll_uiaction_osx.o: $(srcdir)/src/osx/uiaction_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/uiaction_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/msw/wince/checklst.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/checklst.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/cocoa/checklst.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/checklst.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/os2/checklst.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/checklst.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monodll_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monodll_checklst.o: $(srcdir)/src/univ/checklst.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/checklst.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/gtk/choice.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/choice.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/gtk1/choice.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/choice.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monodll_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/motif/choice.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/choice.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_core_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/msw/choice.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_core_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/msw/choice.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monodll_core_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/osx/carbon/choice.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/choice.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_core_colour.o: $(srcdir)/src/osx/core/colour.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/osx/cocoa/choice.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/choice.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_core_colour.o: $(srcdir)/src/osx/core/colour.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/cocoa/choice.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/choice.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monodll_core_colour.o: $(srcdir)/src/osx/core/colour.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_choice.o: $(srcdir)/src/os2/choice.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/choice.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_core_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monodll_choice.o: $(srcdir)/src/univ/choice.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/choice.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_core_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_colordlg.o: $(srcdir)/src/gtk/colordlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/colordlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monodll_core_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_core_display.o: $(srcdir)/src/osx/core/display.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_core_display.o: $(srcdir)/src/osx/core/display.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_colordlg.o: $(srcdir)/src/osx/carbon/colordlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monodll_core_display.o: $(srcdir)/src/osx/core/display.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_colordlg.o: $(srcdir)/src/cocoa/colordlg.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/colordlg.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_core_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_combobox.o: $(srcdir)/src/gtk/combobox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_core_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_combobox.o: $(srcdir)/src/gtk1/combobox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monodll_core_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_combobox.o: $(srcdir)/src/motif/combobox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_combobox.o: $(srcdir)/src/msw/combobox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_combobox.o: $(srcdir)/src/msw/combobox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monodll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_combobox.o: $(srcdir)/src/cocoa/combobox.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/combobox.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_combobox.o: $(srcdir)/src/os2/combobox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monodll_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monodll_combobox.o: $(srcdir)/src/univ/combobox.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_core_timer.o: $(srcdir)/src/osx/core/timer.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_control.o: $(srcdir)/src/gtk/control.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_core_timer.o: $(srcdir)/src/osx/core/timer.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_control.o: $(srcdir)/src/gtk1/control.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monodll_core_timer.o: $(srcdir)/src/osx/core/timer.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_control.o: $(srcdir)/src/motif/control.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_control.o: $(srcdir)/src/msw/control.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_control.o: $(srcdir)/src/msw/control.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monodll_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_control.o: $(srcdir)/src/osx/carbon/control.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_control.o: $(srcdir)/src/osx/carbon/control.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_generic_timer.o: $(srcdir)/src/generic/timer.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_control.o: $(srcdir)/src/cocoa/control.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/control.mm
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_generic_timer.o: $(srcdir)/src/generic/timer.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_control.o: $(srcdir)/src/os2/control.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/control.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_app.o: $(srcdir)/src/x11/app.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/app.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monodll_control.o: $(srcdir)/src/univ/control.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/control.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_clipbrd.o: $(srcdir)/src/x11/clipbrd.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/clipbrd.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/gtk/dialog.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dialog.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_colour.o: $(srcdir)/src/x11/colour.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/colour.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/gtk1/dialog.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/dialog.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_cursor.o: $(srcdir)/src/x11/cursor.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/cursor.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/motif/dialog.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/dialog.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_data.o: $(srcdir)/src/x11/data.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/data.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/msw/dialog.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_dataobj.o: $(srcdir)/src/x11/dataobj.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/dataobj.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/msw/dialog.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_dc.o: $(srcdir)/src/x11/dc.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/dc.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/osx/carbon/dialog.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dialog.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_dcclient.o: $(srcdir)/src/x11/dcclient.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/dcclient.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/osx/cocoa/dialog.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/dialog.mm
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_dcmemory.o: $(srcdir)/src/x11/dcmemory.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/dcmemory.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/cocoa/dialog.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/dialog.mm
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_dcscreen.o: $(srcdir)/src/x11/dcscreen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/dcscreen.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dialog.o: $(srcdir)/src/os2/dialog.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/dialog.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_evtloop.o: $(srcdir)/src/x11/evtloop.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/evtloop.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monodll_dialog.o: $(srcdir)/src/univ/dialog.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/dialog.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_font.o: $(srcdir)/src/x11/font.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/font.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_dirdlg.o: $(srcdir)/src/gtk/dirdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dirdlg.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_minifram.o: $(srcdir)/src/x11/minifram.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/minifram.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_nanox.o: $(srcdir)/src/x11/nanox.c $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/x11/nanox.c
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_popupwin.o: $(srcdir)/src/x11/popupwin.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/popupwin.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_dirdlg.o: $(srcdir)/src/osx/carbon/dirdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dirdlg.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_reparent.o: $(srcdir)/src/x11/reparent.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/reparent.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_dirdlg.o: $(srcdir)/src/osx/cocoa/dirdlg.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/dirdlg.mm
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_settings.o: $(srcdir)/src/x11/settings.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/settings.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_dirdlg.o: $(srcdir)/src/cocoa/dirdlg.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/dirdlg.mm
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_toplevel.o: $(srcdir)/src/x11/toplevel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/toplevel.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/gtk/filedlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/filedlg.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_utils.o: $(srcdir)/src/x11/utils.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/utils.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/gtk1/filedlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/filedlg.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_x11_window.o: $(srcdir)/src/x11/window.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/window.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/filedlg.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_generic_colour.o: $(srcdir)/src/generic/colour.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/osx/carbon/filedlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/filedlg.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_generic_colour.o: $(srcdir)/src/generic/colour.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/osx/cocoa/filedlg.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/filedlg.mm
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mask.o: $(srcdir)/src/generic/mask.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/cocoa/filedlg.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/filedlg.mm
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_mask.o: $(srcdir)/src/generic/mask.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_filedlg.o: $(srcdir)/src/os2/filedlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/filedlg.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_app.o: $(srcdir)/src/mgl/app.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/app.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_fontdlg.o: $(srcdir)/src/gtk/fontdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/fontdlg.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/bitmap.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_fontdlg.o: $(srcdir)/src/gtk1/fontdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/fontdlg.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_brush.o: $(srcdir)/src/mgl/brush.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/brush.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_fontdlg.o: $(srcdir)/src/msw/fontdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/fontdlg.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_clipbrd.o: $(srcdir)/src/mgl/clipbrd.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/clipbrd.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_cursor.o: $(srcdir)/src/mgl/cursor.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/cursor.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_data.o: $(srcdir)/src/mgl/data.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/data.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontdlg.o: $(srcdir)/src/cocoa/fontdlg.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/fontdlg.mm
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_dc.o: $(srcdir)/src/mgl/dc.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/dc.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_fontdlg.o: $(srcdir)/src/os2/fontdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/fontdlg.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/dcclient.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_frame.o: $(srcdir)/src/gtk/frame.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/frame.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/dcmemory.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_frame.o: $(srcdir)/src/gtk1/frame.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/frame.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_dcscreen.o: $(srcdir)/src/mgl/dcscreen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/dcscreen.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_frame.o: $(srcdir)/src/motif/frame.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/frame.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/dirmgl.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_frame.o: $(srcdir)/src/msw/frame.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/evtloop.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_frame.o: $(srcdir)/src/msw/frame.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_font.o: $(srcdir)/src/mgl/font.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/font.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_fontenum.o: $(srcdir)/src/mgl/fontenum.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/fontenum.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_fontmgr.o: $(srcdir)/src/mgl/fontmgr.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/fontmgr.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_frame.o: $(srcdir)/src/cocoa/frame.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/frame.mm
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_fontutil.o: $(srcdir)/src/mgl/fontutil.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/fontutil.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_frame.o: $(srcdir)/src/os2/frame.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/frame.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_palette.o: $(srcdir)/src/mgl/palette.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/palette.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/gtk/gauge.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/gauge.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_pen.o: $(srcdir)/src/mgl/pen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/pen.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/gtk1/gauge.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/gauge.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_region.o: $(srcdir)/src/mgl/region.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/region.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/motif/gauge.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_settings.o: $(srcdir)/src/mgl/settings.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/settings.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/msw/gauge.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_toplevel.o: $(srcdir)/src/mgl/toplevel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/toplevel.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/msw/gauge.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_utils.o: $(srcdir)/src/mgl/utils.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/utils.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/osx/carbon/gauge.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gauge.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_mgl_window.o: $(srcdir)/src/mgl/window.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/window.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/osx/cocoa/gauge.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/gauge.mm
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_app.o: $(srcdir)/src/dfb/app.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/app.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/cocoa/gauge.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/gauge.mm
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_bitmap.o: $(srcdir)/src/dfb/bitmap.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/bitmap.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_gauge.o: $(srcdir)/src/os2/gauge.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/gauge.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_brush.o: $(srcdir)/src/dfb/brush.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/brush.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monodll_gauge.o: $(srcdir)/src/univ/gauge.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/gauge.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_cursor.o: $(srcdir)/src/dfb/cursor.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/cursor.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_print.o: $(srcdir)/src/gtk/print.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/print.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_dc.o: $(srcdir)/src/dfb/dc.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/dc.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_print.o: $(srcdir)/src/os2/print.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/print.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_dcclient.o: $(srcdir)/src/dfb/dcclient.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/dcclient.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/gtk/listbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/listbox.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_dcmemory.o: $(srcdir)/src/dfb/dcmemory.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/dcmemory.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/gtk1/listbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/listbox.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_dcscreen.o: $(srcdir)/src/dfb/dcscreen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/dcscreen.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/motif/listbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/listbox.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_evtloop.o: $(srcdir)/src/dfb/evtloop.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/evtloop.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/msw/listbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_font.o: $(srcdir)/src/dfb/font.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/font.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/msw/listbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_fontenum.o: $(srcdir)/src/dfb/fontenum.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/fontenum.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/osx/carbon/listbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/listbox.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_fontmgr.o: $(srcdir)/src/dfb/fontmgr.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/fontmgr.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/osx/cocoa/listbox.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/listbox.mm
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_nonownedwnd.o: $(srcdir)/src/dfb/nonownedwnd.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/nonownedwnd.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/cocoa/listbox.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/listbox.mm
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_overlay.o: $(srcdir)/src/dfb/overlay.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/overlay.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/os2/listbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/listbox.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_pen.o: $(srcdir)/src/dfb/pen.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/pen.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monodll_listbox.o: $(srcdir)/src/univ/listbox.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/listbox.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_region.o: $(srcdir)/src/dfb/region.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/region.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_mdi.o: $(srcdir)/src/gtk/mdi.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/mdi.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_settings.o: $(srcdir)/src/dfb/settings.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/settings.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_mdi.o: $(srcdir)/src/gtk1/mdi.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/mdi.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_toplevel.o: $(srcdir)/src/dfb/toplevel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/toplevel.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_mdi.o: $(srcdir)/src/motif/mdi.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/mdi.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_utils.o: $(srcdir)/src/dfb/utils.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/utils.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_mdi.o: $(srcdir)/src/msw/mdi.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_dfb_window.o: $(srcdir)/src/dfb/window.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/window.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_mdi.o: $(srcdir)/src/msw/mdi.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_wrapdfb.o: $(srcdir)/src/dfb/wrapdfb.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/dfb/wrapdfb.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
+@COND_PLATFORM_UNIX_1_USE_GUI_1@monodll_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_mdi.o: $(srcdir)/src/cocoa/mdi.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/mdi.mm
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@monodll_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@     $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_menu.o: $(srcdir)/src/gtk/menu.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/menu.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_menu.o: $(srcdir)/src/gtk1/menu.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/menu.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_menu.o: $(srcdir)/src/motif/menu.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/menu.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_menu.o: $(srcdir)/src/msw/menu.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
+@COND_USE_GUI_1_WXUNIV_1@monodll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_menu.o: $(srcdir)/src/msw/menu.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_menu.o: $(srcdir)/src/osx/carbon/menu.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/menu.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_menu.o: $(srcdir)/src/osx/cocoa/menu.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/menu.mm
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_menu.o: $(srcdir)/src/cocoa/menu.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/menu.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_menu.o: $(srcdir)/src/os2/menu.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/menu.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monodll_menu.o: $(srcdir)/src/univ/menu.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/menu.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_msgdlg.o: $(srcdir)/src/gtk/msgdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/msgdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_msgdlg.o: $(srcdir)/src/motif/msgdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/msgdlg.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
+@COND_USE_GUI_1_WXUNIV_1@monodll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_msgdlg.o: $(srcdir)/src/osx/carbon/msgdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/msgdlg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_msgdlg.o: $(srcdir)/src/osx/cocoa/msgdlg.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/msgdlg.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_msgdlg.o: $(srcdir)/src/cocoa/msgdlg.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/msgdlg.mm
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_msgdlg.o: $(srcdir)/src/os2/msgdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/msgdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_nativewin.o: $(srcdir)/src/gtk/nativewin.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/nativewin.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_notebook.o: $(srcdir)/src/gtk/notebook.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/notebook.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_notebook.o: $(srcdir)/src/gtk1/notebook.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/notebook.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_notebook.o: $(srcdir)/src/generic/notebook.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/notebook.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_notebook.o: $(srcdir)/src/msw/notebook.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
+@COND_USE_GUI_1_WXUNIV_1@monodll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_notebook.o: $(srcdir)/src/msw/notebook.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_notebook.o: $(srcdir)/src/osx/cocoa/notebook.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/notebook.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_notebook.o: $(srcdir)/src/cocoa/notebook.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/notebook.mm
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_notebook.o: $(srcdir)/src/os2/notebook.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/notebook.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monodll_notebook.o: $(srcdir)/src/univ/notebook.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/notebook.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_radiobox.o: $(srcdir)/src/gtk/radiobox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/radiobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_radiobox.o: $(srcdir)/src/gtk1/radiobox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/radiobox.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_radiobox.o: $(srcdir)/src/motif/radiobox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/radiobox.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
+@COND_USE_GUI_1_WXUNIV_1@monodll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_radiobox.o: $(srcdir)/src/cocoa/radiobox.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/radiobox.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_radiobox.o: $(srcdir)/src/os2/radiobox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/radiobox.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monodll_radiobox.o: $(srcdir)/src/univ/radiobox.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/radiobox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_radiobut.o: $(srcdir)/src/gtk/radiobut.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/radiobut.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_radiobut.o: $(srcdir)/src/gtk1/radiobut.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/radiobut.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_radiobut.o: $(srcdir)/src/motif/radiobut.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/radiobut.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_radiobut.o: $(srcdir)/src/osx/carbon/radiobut.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/radiobut.cpp
+@COND_USE_GUI_1_WXUNIV_1@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_radiobut.o: $(srcdir)/src/osx/cocoa/radiobut.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/radiobut.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_radiobut.o: $(srcdir)/src/cocoa/radiobut.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/radiobut.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_radiobut.o: $(srcdir)/src/os2/radiobut.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/radiobut.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monodll_radiobut.o: $(srcdir)/src/univ/radiobut.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/radiobut.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_scrolbar.o: $(srcdir)/src/gtk/scrolbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/scrolbar.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_scrolbar.o: $(srcdir)/src/gtk1/scrolbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/scrolbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/scrolbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_scrolbar.o: $(srcdir)/src/osx/carbon/scrolbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/scrolbar.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_scrolbar.o: $(srcdir)/src/osx/cocoa/scrolbar.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/scrolbar.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_scrolbar.o: $(srcdir)/src/cocoa/scrolbar.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/scrolbar.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/scrolbar.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monodll_scrolbar.o: $(srcdir)/src/univ/scrolbar.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/scrolbar.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_scrolwin.o: $(srcdir)/src/gtk/scrolwin.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/scrolwin.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_scrolwin.o: $(srcdir)/src/gtk1/scrolwin.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/scrolwin.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/gtk/slider.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/slider.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/gtk1/slider.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/slider.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/motif/slider.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/slider.cpp
+@COND_USE_GUI_1_WXUNIV_1@monodll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/msw/slider.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/msw/slider.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/osx/carbon/slider.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/slider.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/osx/cocoa/slider.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/slider.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/cocoa/slider.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/slider.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_slider.o: $(srcdir)/src/os2/slider.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/slider.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monodll_slider.o: $(srcdir)/src/univ/slider.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/slider.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_spinbutt.o: $(srcdir)/src/gtk/spinbutt.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/spinbutt.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_spinbutt.o: $(srcdir)/src/gtk1/spinbutt.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/spinbutt.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_spinbutt.o: $(srcdir)/src/motif/spinbutt.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/spinbutt.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_spinbutt.o: $(srcdir)/src/osx/carbon/spinbutt.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/spinbutt.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_spinbutt.o: $(srcdir)/src/osx/cocoa/spinbutt.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/spinbutt.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_spinbutt.o: $(srcdir)/src/cocoa/spinbutt.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/spinbutt.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_spinbutt.o: $(srcdir)/src/os2/spinbutt.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/spinbutt.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monodll_spinbutt.o: $(srcdir)/src/univ/spinbutt.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/spinbutt.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_spinctrl.o: $(srcdir)/src/gtk/spinctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/spinctrl.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_spinctrl.o: $(srcdir)/src/gtk1/spinctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/spinctrl.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/spinctrl.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_statbmp.o: $(srcdir)/src/gtk/statbmp.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/statbmp.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_statbmp.o: $(srcdir)/src/gtk1/statbmp.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/statbmp.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_statbmp.o: $(srcdir)/src/motif/statbmp.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/statbmp.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_statbmp.o: $(srcdir)/src/osx/carbon/statbmp.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbmp.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_statbmp.o: $(srcdir)/src/cocoa/statbmp.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/statbmp.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_statbmp.o: $(srcdir)/src/os2/statbmp.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/statbmp.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monodll_statbmp.o: $(srcdir)/src/univ/statbmp.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/statbmp.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_statbox.o: $(srcdir)/src/gtk/statbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/statbox.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_statbox.o: $(srcdir)/src/gtk1/statbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/statbox.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_statbox.o: $(srcdir)/src/motif/statbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/statbox.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_statbox.o: $(srcdir)/src/msw/statbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_statbox.o: $(srcdir)/src/msw/statbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_statbox.o: $(srcdir)/src/osx/carbon/statbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbox.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_statbox.o: $(srcdir)/src/osx/cocoa/statbox.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/statbox.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_statbox.o: $(srcdir)/src/cocoa/statbox.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/statbox.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_statbox.o: $(srcdir)/src/os2/statbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/statbox.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monodll_statbox.o: $(srcdir)/src/univ/statbox.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/statbox.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_statline.o: $(srcdir)/src/gtk/statline.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/statline.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_statline.o: $(srcdir)/src/gtk1/statline.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/statline.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_statline.o: $(srcdir)/src/generic/statline.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statline.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_statline.o: $(srcdir)/src/msw/statline.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_statline.o: $(srcdir)/src/msw/statline.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_statline.o: $(srcdir)/src/osx/cocoa/statline.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/statline.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_statline.o: $(srcdir)/src/os2/statline.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/statline.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monodll_statline.o: $(srcdir)/src/univ/statline.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/statline.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/stattext.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/motif/stattext.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/stattext.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/msw/stattext.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/msw/stattext.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/osx/carbon/stattext.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/stattext.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/osx/cocoa/stattext.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/stattext.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/cocoa/stattext.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/stattext.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_stattext.o: $(srcdir)/src/os2/stattext.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/stattext.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monodll_stattext.o: $(srcdir)/src/univ/stattext.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/stattext.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/tbargtk.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_tbargtk.o: $(srcdir)/src/gtk1/tbargtk.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/tbargtk.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/textctrl.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/motif/textctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/textctrl.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/osx/carbon/textctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/textctrl.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/osx/cocoa/textctrl.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/textctrl.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/cocoa/textctrl.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/textctrl.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_textctrl.o: $(srcdir)/src/os2/textctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/textctrl.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monodll_textctrl.o: $(srcdir)/src/univ/textctrl.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/textctrl.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_textentry.o: $(srcdir)/src/gtk/textentry.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/textentry.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_textentry.o: $(srcdir)/src/motif/textentry.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/textentry.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_textentry.o: $(srcdir)/src/msw/textentry.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_textentry.o: $(srcdir)/src/msw/textentry.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_textentry.o: $(srcdir)/src/os2/textentry.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/textentry.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_tglbtn.o: $(srcdir)/src/gtk/tglbtn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/tglbtn.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_tglbtn.o: $(srcdir)/src/gtk1/tglbtn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/tglbtn.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_tglbtn.o: $(srcdir)/src/osx/carbon/tglbtn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tglbtn.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_tglbtn.o: $(srcdir)/src/osx/cocoa/tglbtn.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/tglbtn.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_tglbtn.o: $(srcdir)/src/os2/tglbtn.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/tglbtn.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monodll_tglbtn.o: $(srcdir)/src/univ/tglbtn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/tglbtn.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_USE_GUI_1_WXUNIV_1@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
@@ -17409,11 +19130,14 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
@@ -17430,6 +19154,15 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
  
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
  
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
+
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
  
@@ -17448,6 +19181,15 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
  
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
+
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
  
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
  
@@ -17460,6 +19202,15 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
  
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
+
  @COND_USE_GUI_1_WXUNIV_1@monodll_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
  
  @COND_USE_GUI_1_WXUNIV_1@monodll_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
  
@@ -17475,11 +19226,14 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
@@ -17490,50 +19244,62 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  @COND_USE_GUI_1_WXUNIV_1@monodll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/menuitem.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
+@COND_USE_GUI_1_WXUNIV_1@monodll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_menuitem.o: $(srcdir)/src/osx/carbon/menuitem.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/menuitem.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_menuitem.o: $(srcdir)/src/osx/cocoa/menuitem.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/menuitem.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_menuitem.o: $(srcdir)/src/cocoa/menuitem.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/menuitem.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_anybutton.o: $(srcdir)/src/msw/anybutton.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/anybutton.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_menuitem.o: $(srcdir)/src/os2/menuitem.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/menuitem.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_anybutton.o: $(srcdir)/src/msw/anybutton.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/anybutton.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_toolbar.o: $(srcdir)/src/motif/toolbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/toolbar.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_artmsw.o: $(srcdir)/src/msw/artmsw.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/artmsw.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_artmsw.o: $(srcdir)/src/msw/artmsw.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/artmsw.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_button.o: $(srcdir)/src/msw/button.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/button.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_button.o: $(srcdir)/src/msw/button.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/button.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_toolbar.o: $(srcdir)/src/osx/carbon/toolbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/toolbar.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_toolbar.o: $(srcdir)/src/osx/cocoa/toolbar.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/toolbar.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_choice.o: $(srcdir)/src/msw/choice.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_toolbar.o: $(srcdir)/src/cocoa/toolbar.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/toolbar.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_choice.o: $(srcdir)/src/msw/choice.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_toolbar.o: $(srcdir)/src/os2/toolbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/toolbar.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monodll_toolbar.o: $(srcdir)/src/univ/toolbar.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/toolbar.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_combo.o: $(srcdir)/src/msw/combo.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_combo.o: $(srcdir)/src/msw/combo.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
@@ -17541,44 +19307,125 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_combo.o: $(srcdir)/src/msw/combo.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_combo.o: $(srcdir)/src/msw/combo.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
  
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_combobox.o: $(srcdir)/src/msw/combobox.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_combobox.o: $(srcdir)/src/msw/combobox.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_control.o: $(srcdir)/src/msw/control.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/control.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_control.o: $(srcdir)/src/msw/control.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/control.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_dialog.o: $(srcdir)/src/msw/dialog.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_dialog.o: $(srcdir)/src/msw/dialog.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
+
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_frame.o: $(srcdir)/src/msw/frame.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_frame.o: $(srcdir)/src/msw/frame.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_gauge.o: $(srcdir)/src/msw/gauge.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_gauge.o: $(srcdir)/src/msw/gauge.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_headerctrl.o: $(srcdir)/src/msw/headerctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/headerctrl.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_headerctrl.o: $(srcdir)/src/msw/headerctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/headerctrl.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_iniconf.o: $(srcdir)/src/os2/iniconf.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/iniconf.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_listbox.o: $(srcdir)/src/msw/listbox.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_listbox.o: $(srcdir)/src/msw/listbox.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_mdi.o: $(srcdir)/src/msw/mdi.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_mdi.o: $(srcdir)/src/msw/mdi.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_menu.o: $(srcdir)/src/msw/menu.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_menu.o: $(srcdir)/src/msw/menu.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_metafile.o: $(srcdir)/src/msw/metafile.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_metafile.o: $(srcdir)/src/msw/metafile.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_metafile.o: $(srcdir)/src/msw/metafile.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_metafile.o: $(srcdir)/src/msw/metafile.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_metafile.o: $(srcdir)/src/os2/metafile.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/metafile.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_nativdlg.o: $(srcdir)/src/os2/nativdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/nativdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_notebook.o: $(srcdir)/src/msw/notebook.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_notebook.o: $(srcdir)/src/msw/notebook.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_access.o: $(srcdir)/src/msw/ole/access.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_access.o: $(srcdir)/src/msw/ole/access.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
@@ -17586,452 +19433,1070 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_access.o: $(srcdir)/src/msw/ole/access.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_access.o: $(srcdir)/src/msw/ole/access.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/ownerdrw.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_panel.o: $(srcdir)/src/msw/panel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/panel.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_panel.o: $(srcdir)/src/msw/panel.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/panel.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_progdlg.o: $(srcdir)/src/msw/progdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/progdlg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_progdlg.o: $(srcdir)/src/msw/progdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/progdlg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_tabctrl.o: $(srcdir)/src/osx/carbon/tabctrl.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tabctrl.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_tabctrl.o: $(srcdir)/src/osx/carbon/tabctrl.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tabctrl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_tabctrl.o: $(srcdir)/src/os2/tabctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/tabctrl.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_richmsgdlg.o: $(srcdir)/src/msw/richmsgdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/richmsgdlg.cpp
  
  
-@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) $(srcdir)/src/msw/treectrl.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_richmsgdlg.o: $(srcdir)/src/msw/richmsgdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/richmsgdlg.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_slider.o: $(srcdir)/src/msw/slider.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_slider.o: $(srcdir)/src/msw/slider.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_srchctrl.o: $(srcdir)/src/osx/carbon/srchctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/srchctrl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_srchctrl.o: $(srcdir)/src/osx/cocoa/srchctrl.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/srchctrl.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_regiong.o: $(srcdir)/src/generic/regiong.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_statbox.o: $(srcdir)/src/msw/statbox.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_regiong.o: $(srcdir)/src/generic/regiong.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_statbox.o: $(srcdir)/src/msw/statbox.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
  
  
-@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) $(srcdir)/src/cocoa/drawer.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_drawer.o: $(srcdir)/src/osx/carbon/drawer.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/drawer.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_sound.o: $(srcdir)/src/cocoa/sound.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/sound.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_statline.o: $(srcdir)/src/msw/statline.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_sound.o: $(srcdir)/src/msw/sound.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/sound.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_statline.o: $(srcdir)/src/msw/statline.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_sound.o: $(srcdir)/src/msw/sound.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/sound.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_stattext.o: $(srcdir)/src/msw/stattext.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_sound.o: $(srcdir)/src/osx/carbon/sound.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/sound.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_stattext.o: $(srcdir)/src/msw/stattext.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
  
  
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monodll_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_textentry.o: $(srcdir)/src/msw/textentry.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1@monodll_sound.o: $(srcdir)/src/os2/sound.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/sound.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_textentry.o: $(srcdir)/src/msw/textentry.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monodll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
  
  
-@COND_USE_GUI_1@monodll_accelcmn.o: $(srcdir)/src/common/accelcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/accelcmn.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp
  
  
-@COND_USE_GUI_1@monodll_accesscmn.o: $(srcdir)/src/common/accesscmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/accesscmn.cpp
+@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) $(srcdir)/src/msw/treectrl.cpp
  
  
-@COND_USE_GUI_1@monodll_anidecod.o: $(srcdir)/src/common/anidecod.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/anidecod.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_anybutton_osx.o: $(srcdir)/src/osx/anybutton_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/anybutton_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_appcmn.o: $(srcdir)/src/common/appcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/appcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_anybutton_osx.o: $(srcdir)/src/osx/anybutton_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/anybutton_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_artprov.o: $(srcdir)/src/common/artprov.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/artprov.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_anybutton_osx.o: $(srcdir)/src/osx/anybutton_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/anybutton_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_artstd.o: $(srcdir)/src/common/artstd.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/artstd.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/bmpbase.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/bookctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_btncmn.o: $(srcdir)/src/common/btncmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/btncmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_cairo.o: $(srcdir)/src/common/cairo.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/cairo.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/choiccmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_clipcmn.o: $(srcdir)/src/common/clipcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/clipcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_clrpickercmn.o: $(srcdir)/src/common/clrpickercmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/clrpickercmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_colourcmn.o: $(srcdir)/src/common/colourcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/colourcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_combocmn.o: $(srcdir)/src/common/combocmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/combocmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_cmdproc.o: $(srcdir)/src/common/cmdproc.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/cmdproc.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_cmndata.o: $(srcdir)/src/common/cmndata.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/cmndata.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_containr.o: $(srcdir)/src/common/containr.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/containr.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_cshelp.o: $(srcdir)/src/common/cshelp.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/cshelp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_ctrlcmn.o: $(srcdir)/src/common/ctrlcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/ctrlcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/ctrlsub.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_combobox_osx.o: $(srcdir)/src/osx/combobox_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/combobox_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_datacmn.o: $(srcdir)/src/common/datacmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/datacmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_combobox_osx.o: $(srcdir)/src/osx/combobox_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/combobox_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_dcbase.o: $(srcdir)/src/common/dcbase.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dcbase.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_combobox_osx.o: $(srcdir)/src/osx/combobox_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/combobox_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_dcbufcmn.o: $(srcdir)/src/common/dcbufcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dcbufcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_dnd_osx.o: $(srcdir)/src/osx/dnd_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/dnd_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_dcgraph.o: $(srcdir)/src/common/dcgraph.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dcgraph.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_dnd_osx.o: $(srcdir)/src/osx/dnd_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/dnd_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_dcsvg.o: $(srcdir)/src/common/dcsvg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dcsvg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_dnd_osx.o: $(srcdir)/src/osx/dnd_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/dnd_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_dndcmn.o: $(srcdir)/src/common/dndcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dndcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_dobjcmn.o: $(srcdir)/src/common/dobjcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dobjcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_docmdi.o: $(srcdir)/src/common/docmdi.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/docmdi.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_docview.o: $(srcdir)/src/common/docview.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/docview.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_dpycmn.o: $(srcdir)/src/common/dpycmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dpycmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_dseldlg.o: $(srcdir)/src/common/dseldlg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dseldlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_effects.o: $(srcdir)/src/common/effects.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/effects.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_fddlgcmn.o: $(srcdir)/src/common/fddlgcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fddlgcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_filectrlcmn.o: $(srcdir)/src/common/filectrlcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/filectrlcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_filepickercmn.o: $(srcdir)/src/common/filepickercmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/filepickercmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_fontpickercmn.o: $(srcdir)/src/common/fontpickercmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontpickercmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_fldlgcmn.o: $(srcdir)/src/common/fldlgcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fldlgcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_fontenumcmn.o: $(srcdir)/src/common/fontenumcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontenumcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_fontmap.o: $(srcdir)/src/common/fontmap.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontmap.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_printdlg_osx.o: $(srcdir)/src/osx/printdlg_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/printdlg_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_fontutilcmn.o: $(srcdir)/src/common/fontutilcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontutilcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_printdlg_osx.o: $(srcdir)/src/osx/printdlg_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/printdlg_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_framecmn.o: $(srcdir)/src/common/framecmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/framecmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_printdlg_osx.o: $(srcdir)/src/osx/printdlg_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/printdlg_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_gaugecmn.o: $(srcdir)/src/common/gaugecmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gaugecmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_gbsizer.o: $(srcdir)/src/common/gbsizer.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gbsizer.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_gdicmn.o: $(srcdir)/src/common/gdicmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gdicmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_geometry.o: $(srcdir)/src/common/geometry.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/geometry.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_gifdecod.o: $(srcdir)/src/common/gifdecod.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gifdecod.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_graphcmn.o: $(srcdir)/src/common/graphcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/graphcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_helpbase.o: $(srcdir)/src/common/helpbase.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/helpbase.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_iconbndl.o: $(srcdir)/src/common/iconbndl.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/iconbndl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_imagall.o: $(srcdir)/src/common/imagall.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagall.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_imagbmp.o: $(srcdir)/src/common/imagbmp.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_image.o: $(srcdir)/src/common/image.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/image.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_imagfill.o: $(srcdir)/src/common/imagfill.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagfill.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_imaggif.o: $(srcdir)/src/common/imaggif.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imaggif.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_imagiff.o: $(srcdir)/src/common/imagiff.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagiff.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_imagjpeg.o: $(srcdir)/src/common/imagjpeg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagjpeg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_imagpcx.o: $(srcdir)/src/common/imagpcx.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagpcx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_imagpng.o: $(srcdir)/src/common/imagpng.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagpng.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_imagpnm.o: $(srcdir)/src/common/imagpnm.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagpnm.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_imagtga.o: $(srcdir)/src/common/imagtga.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagtga.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_imagtiff.o: $(srcdir)/src/common/imagtiff.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagtiff.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_imagxpm.o: $(srcdir)/src/common/imagxpm.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagxpm.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_layout.o: $(srcdir)/src/common/layout.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/layout.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_lboxcmn.o: $(srcdir)/src/common/lboxcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/lboxcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_listctrlcmn.o: $(srcdir)/src/common/listctrlcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/listctrlcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_matrix.o: $(srcdir)/src/common/matrix.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/matrix.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_menucmn.o: $(srcdir)/src/common/menucmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/menucmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_nbkbase.o: $(srcdir)/src/common/nbkbase.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/nbkbase.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_overlaycmn.o: $(srcdir)/src/common/overlaycmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/overlaycmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_paper.o: $(srcdir)/src/common/paper.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/paper.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_pickerbase.o: $(srcdir)/src/common/pickerbase.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/pickerbase.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_popupcmn.o: $(srcdir)/src/common/popupcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/popupcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_textentry_osx.o: $(srcdir)/src/osx/textentry_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/textentry_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_prntbase.o: $(srcdir)/src/common/prntbase.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/prntbase.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_textentry_osx.o: $(srcdir)/src/osx/textentry_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/textentry_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_quantize.o: $(srcdir)/src/common/quantize.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/quantize.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_textentry_osx.o: $(srcdir)/src/osx/textentry_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/textentry_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_radiocmn.o: $(srcdir)/src/common/radiocmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/radiocmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_rendcmn.o: $(srcdir)/src/common/rendcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/rendcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/rgncmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_settcmn.o: $(srcdir)/src/common/settcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/settcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_sizer.o: $(srcdir)/src/common/sizer.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_statbar.o: $(srcdir)/src/common/statbar.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/statbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_stattextcmn.o: $(srcdir)/src/common/stattextcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/stattextcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_stockitem.o: $(srcdir)/src/common/stockitem.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/stockitem.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
  
  
-@COND_USE_GUI_1@monodll_tbarbase.o: $(srcdir)/src/common/tbarbase.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/tbarbase.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm
  
  
-@COND_USE_GUI_1@monodll_textcmn.o: $(srcdir)/src/common/textcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/textcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm
  
  
-@COND_USE_GUI_1@monodll_textentrycmn.o: $(srcdir)/src/common/textentrycmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/textentrycmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm
  
  
-@COND_USE_GUI_1@monodll_toplvcmn.o: $(srcdir)/src/common/toplvcmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/toplvcmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
  
  
-@COND_USE_GUI_1@monodll_treebase.o: $(srcdir)/src/common/treebase.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/treebase.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
  
  
-@COND_USE_GUI_1@monodll_valgen.o: $(srcdir)/src/common/valgen.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/valgen.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
  
  
-@COND_USE_GUI_1@monodll_validate.o: $(srcdir)/src/common/validate.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/validate.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
  
  
-@COND_USE_GUI_1@monodll_valtext.o: $(srcdir)/src/common/valtext.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/valtext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
  
  
-@COND_USE_GUI_1@monodll_wincmn.o: $(srcdir)/src/common/wincmn.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/wincmn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
  
  
-@COND_USE_GUI_1@monodll_windowid.o: $(srcdir)/src/common/windowid.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/windowid.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_osx_accel.o: $(srcdir)/src/osx/accel.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
  
  
-@COND_USE_GUI_1@monodll_wrapsizer.o: $(srcdir)/src/common/wrapsizer.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/wrapsizer.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_osx_accel.o: $(srcdir)/src/osx/accel.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
  
  
-@COND_USE_GUI_1@monodll_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/xpmdecod.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_osx_accel.o: $(srcdir)/src/osx/accel.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
  
  
-@COND_USE_GUI_1@monodll_busyinfo.o: $(srcdir)/src/generic/busyinfo.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/busyinfo.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
  
  
-@COND_USE_GUI_1@monodll_buttonbar.o: $(srcdir)/src/generic/buttonbar.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/buttonbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
  
  
-@COND_USE_GUI_1@monodll_choicdgg.o: $(srcdir)/src/generic/choicdgg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/choicdgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
  
  
-@COND_USE_GUI_1@monodll_choicbkg.o: $(srcdir)/src/generic/choicbkg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/choicbkg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
  
  
-@COND_USE_GUI_1@monodll_combog.o: $(srcdir)/src/generic/combog.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/combog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
  
  
-@COND_USE_GUI_1@monodll_dcpsg.o: $(srcdir)/src/generic/dcpsg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dcpsg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
  
  
-@COND_USE_GUI_1@monodll_dirctrlg.o: $(srcdir)/src/generic/dirctrlg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dirctrlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
  
  
-@COND_USE_GUI_1@monodll_dragimgg.o: $(srcdir)/src/generic/dragimgg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dragimgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
  
  
-@COND_USE_GUI_1@monodll_filectrlg.o: $(srcdir)/src/generic/filectrlg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filectrlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
  
  
-@COND_USE_GUI_1@monodll_listbkg.o: $(srcdir)/src/generic/listbkg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listbkg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
  
  
-@COND_USE_GUI_1@monodll_logg.o: $(srcdir)/src/generic/logg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/logg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
  
  
-@COND_USE_GUI_1@monodll_numdlgg.o: $(srcdir)/src/generic/numdlgg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/numdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
  
  
-@COND_USE_GUI_1@monodll_panelg.o: $(srcdir)/src/generic/panelg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/panelg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_app.o: $(srcdir)/src/osx/carbon/app.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_app.o: $(srcdir)/src/osx/carbon/app.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_app.o: $(srcdir)/src/osx/carbon/app.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_control.o: $(srcdir)/src/osx/carbon/control.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_control.o: $(srcdir)/src/osx/carbon/control.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_control.o: $(srcdir)/src/osx/carbon/control.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_glgrab.o: $(srcdir)/src/osx/core/glgrab.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/glgrab.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_glgrab.o: $(srcdir)/src/osx/core/glgrab.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/glgrab.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_glgrab.o: $(srcdir)/src/osx/core/glgrab.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/glgrab.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_font.o: $(srcdir)/src/osx/carbon/font.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_font.o: $(srcdir)/src/osx/carbon/font.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_font.o: $(srcdir)/src/osx/carbon/font.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_region.o: $(srcdir)/src/osx/carbon/region.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/region.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_region.o: $(srcdir)/src/osx/carbon/region.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/region.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_region.o: $(srcdir)/src/osx/carbon/region.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/region.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
+
+@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_regiong.o: $(srcdir)/src/generic/regiong.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_regiong.o: $(srcdir)/src/generic/regiong.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
+
+@COND_USE_GUI_1@monodll_accelcmn.o: $(srcdir)/src/common/accelcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/accelcmn.cpp
+
+@COND_USE_GUI_1@monodll_accesscmn.o: $(srcdir)/src/common/accesscmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/accesscmn.cpp
+
+@COND_USE_GUI_1@monodll_anidecod.o: $(srcdir)/src/common/anidecod.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/anidecod.cpp
+
+@COND_USE_GUI_1@monodll_affinematrix2d.o: $(srcdir)/src/common/affinematrix2d.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/affinematrix2d.cpp
+
+@COND_USE_GUI_1@monodll_appcmn.o: $(srcdir)/src/common/appcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/appcmn.cpp
+
+@COND_USE_GUI_1@monodll_artprov.o: $(srcdir)/src/common/artprov.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/artprov.cpp
+
+@COND_USE_GUI_1@monodll_artstd.o: $(srcdir)/src/common/artstd.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/artstd.cpp
+
+@COND_USE_GUI_1@monodll_arttango.o: $(srcdir)/src/common/arttango.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/arttango.cpp
+
+@COND_USE_GUI_1@monodll_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/bmpbase.cpp
+
+@COND_USE_GUI_1@monodll_bmpbtncmn.o: $(srcdir)/src/common/bmpbtncmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/bmpbtncmn.cpp
+
+@COND_USE_GUI_1@monodll_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/bookctrl.cpp
+
+@COND_USE_GUI_1@monodll_btncmn.o: $(srcdir)/src/common/btncmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/btncmn.cpp
+
+@COND_USE_GUI_1@monodll_cairo.o: $(srcdir)/src/common/cairo.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/cairo.cpp
+
+@COND_USE_GUI_1@monodll_checkboxcmn.o: $(srcdir)/src/common/checkboxcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/checkboxcmn.cpp
+
+@COND_USE_GUI_1@monodll_checklstcmn.o: $(srcdir)/src/common/checklstcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/checklstcmn.cpp
+
+@COND_USE_GUI_1@monodll_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/choiccmn.cpp
+
+@COND_USE_GUI_1@monodll_clipcmn.o: $(srcdir)/src/common/clipcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/clipcmn.cpp
+
+@COND_USE_GUI_1@monodll_clrpickercmn.o: $(srcdir)/src/common/clrpickercmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/clrpickercmn.cpp
+
+@COND_USE_GUI_1@monodll_colourcmn.o: $(srcdir)/src/common/colourcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/colourcmn.cpp
+
+@COND_USE_GUI_1@monodll_colourdata.o: $(srcdir)/src/common/colourdata.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/colourdata.cpp
+
+@COND_USE_GUI_1@monodll_combocmn.o: $(srcdir)/src/common/combocmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/combocmn.cpp
+
+@COND_USE_GUI_1@monodll_cmdproc.o: $(srcdir)/src/common/cmdproc.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/cmdproc.cpp
+
+@COND_USE_GUI_1@monodll_cmndata.o: $(srcdir)/src/common/cmndata.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/cmndata.cpp
+
+@COND_USE_GUI_1@monodll_containr.o: $(srcdir)/src/common/containr.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/containr.cpp
+
+@COND_USE_GUI_1@monodll_cshelp.o: $(srcdir)/src/common/cshelp.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/cshelp.cpp
+
+@COND_USE_GUI_1@monodll_ctrlcmn.o: $(srcdir)/src/common/ctrlcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/ctrlcmn.cpp
+
+@COND_USE_GUI_1@monodll_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/ctrlsub.cpp
+
+@COND_USE_GUI_1@monodll_dcbase.o: $(srcdir)/src/common/dcbase.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dcbase.cpp
+
+@COND_USE_GUI_1@monodll_dcbufcmn.o: $(srcdir)/src/common/dcbufcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dcbufcmn.cpp
+
+@COND_USE_GUI_1@monodll_dcgraph.o: $(srcdir)/src/common/dcgraph.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dcgraph.cpp
+
+@COND_USE_GUI_1@monodll_dcsvg.o: $(srcdir)/src/common/dcsvg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dcsvg.cpp
+
+@COND_USE_GUI_1@monodll_dirctrlcmn.o: $(srcdir)/src/common/dirctrlcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dirctrlcmn.cpp
+
+@COND_USE_GUI_1@monodll_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp
+
+@COND_USE_GUI_1@monodll_dndcmn.o: $(srcdir)/src/common/dndcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dndcmn.cpp
+
+@COND_USE_GUI_1@monodll_dobjcmn.o: $(srcdir)/src/common/dobjcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dobjcmn.cpp
+
+@COND_USE_GUI_1@monodll_docmdi.o: $(srcdir)/src/common/docmdi.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/docmdi.cpp
+
+@COND_USE_GUI_1@monodll_docview.o: $(srcdir)/src/common/docview.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/docview.cpp
+
+@COND_USE_GUI_1@monodll_dpycmn.o: $(srcdir)/src/common/dpycmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dpycmn.cpp
+
+@COND_USE_GUI_1@monodll_dseldlg.o: $(srcdir)/src/common/dseldlg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dseldlg.cpp
+
+@COND_USE_GUI_1@monodll_effects.o: $(srcdir)/src/common/effects.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/effects.cpp
+
+@COND_USE_GUI_1@monodll_fddlgcmn.o: $(srcdir)/src/common/fddlgcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fddlgcmn.cpp
+
+@COND_USE_GUI_1@monodll_filectrlcmn.o: $(srcdir)/src/common/filectrlcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/filectrlcmn.cpp
+
+@COND_USE_GUI_1@monodll_filehistorycmn.o: $(srcdir)/src/common/filehistorycmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/filehistorycmn.cpp
+
+@COND_USE_GUI_1@monodll_filepickercmn.o: $(srcdir)/src/common/filepickercmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/filepickercmn.cpp
+
+@COND_USE_GUI_1@monodll_fontpickercmn.o: $(srcdir)/src/common/fontpickercmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontpickercmn.cpp
+
+@COND_USE_GUI_1@monodll_fldlgcmn.o: $(srcdir)/src/common/fldlgcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fldlgcmn.cpp
+
+@COND_USE_GUI_1@monodll_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontcmn.cpp
+
+@COND_USE_GUI_1@monodll_fontdata.o: $(srcdir)/src/common/fontdata.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontdata.cpp
+
+@COND_USE_GUI_1@monodll_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp
+
+@COND_USE_GUI_1@monodll_fontenumcmn.o: $(srcdir)/src/common/fontenumcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontenumcmn.cpp
+
+@COND_USE_GUI_1@monodll_fontmap.o: $(srcdir)/src/common/fontmap.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontmap.cpp
+
+@COND_USE_GUI_1@monodll_fontutilcmn.o: $(srcdir)/src/common/fontutilcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fontutilcmn.cpp
+
+@COND_USE_GUI_1@monodll_framecmn.o: $(srcdir)/src/common/framecmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/framecmn.cpp
+
+@COND_USE_GUI_1@monodll_gaugecmn.o: $(srcdir)/src/common/gaugecmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gaugecmn.cpp
+
+@COND_USE_GUI_1@monodll_gbsizer.o: $(srcdir)/src/common/gbsizer.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gbsizer.cpp
+
+@COND_USE_GUI_1@monodll_gdicmn.o: $(srcdir)/src/common/gdicmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gdicmn.cpp
+
+@COND_USE_GUI_1@monodll_geometry.o: $(srcdir)/src/common/geometry.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/geometry.cpp
+
+@COND_USE_GUI_1@monodll_gifdecod.o: $(srcdir)/src/common/gifdecod.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gifdecod.cpp
+
+@COND_USE_GUI_1@monodll_graphcmn.o: $(srcdir)/src/common/graphcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/graphcmn.cpp
+
+@COND_USE_GUI_1@monodll_headercolcmn.o: $(srcdir)/src/common/headercolcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/headercolcmn.cpp
+
+@COND_USE_GUI_1@monodll_headerctrlcmn.o: $(srcdir)/src/common/headerctrlcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/headerctrlcmn.cpp
+
+@COND_USE_GUI_1@monodll_helpbase.o: $(srcdir)/src/common/helpbase.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/helpbase.cpp
+
+@COND_USE_GUI_1@monodll_iconbndl.o: $(srcdir)/src/common/iconbndl.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/iconbndl.cpp
+
+@COND_USE_GUI_1@monodll_imagall.o: $(srcdir)/src/common/imagall.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagall.cpp
+
+@COND_USE_GUI_1@monodll_imagbmp.o: $(srcdir)/src/common/imagbmp.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagbmp.cpp
+
+@COND_USE_GUI_1@monodll_image.o: $(srcdir)/src/common/image.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/image.cpp
+
+@COND_USE_GUI_1@monodll_imagfill.o: $(srcdir)/src/common/imagfill.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagfill.cpp
+
+@COND_USE_GUI_1@monodll_imaggif.o: $(srcdir)/src/common/imaggif.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imaggif.cpp
+
+@COND_USE_GUI_1@monodll_imagiff.o: $(srcdir)/src/common/imagiff.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagiff.cpp
+
+@COND_USE_GUI_1@monodll_imagjpeg.o: $(srcdir)/src/common/imagjpeg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagjpeg.cpp
+
+@COND_USE_GUI_1@monodll_imagpcx.o: $(srcdir)/src/common/imagpcx.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagpcx.cpp
+
+@COND_USE_GUI_1@monodll_imagpng.o: $(srcdir)/src/common/imagpng.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagpng.cpp
+
+@COND_USE_GUI_1@monodll_imagpnm.o: $(srcdir)/src/common/imagpnm.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagpnm.cpp
+
+@COND_USE_GUI_1@monodll_imagtga.o: $(srcdir)/src/common/imagtga.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagtga.cpp
+
+@COND_USE_GUI_1@monodll_imagtiff.o: $(srcdir)/src/common/imagtiff.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagtiff.cpp
+
+@COND_USE_GUI_1@monodll_imagxpm.o: $(srcdir)/src/common/imagxpm.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagxpm.cpp
+
+@COND_USE_GUI_1@monodll_layout.o: $(srcdir)/src/common/layout.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/layout.cpp
+
+@COND_USE_GUI_1@monodll_lboxcmn.o: $(srcdir)/src/common/lboxcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/lboxcmn.cpp
+
+@COND_USE_GUI_1@monodll_listctrlcmn.o: $(srcdir)/src/common/listctrlcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/listctrlcmn.cpp
+
+@COND_USE_GUI_1@monodll_markupparser.o: $(srcdir)/src/common/markupparser.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/markupparser.cpp
+
+@COND_USE_GUI_1@monodll_matrix.o: $(srcdir)/src/common/matrix.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/matrix.cpp
+
+@COND_USE_GUI_1@monodll_menucmn.o: $(srcdir)/src/common/menucmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/menucmn.cpp
+
+@COND_USE_GUI_1@monodll_mousemanager.o: $(srcdir)/src/common/mousemanager.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/mousemanager.cpp
+
+@COND_USE_GUI_1@monodll_nbkbase.o: $(srcdir)/src/common/nbkbase.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/nbkbase.cpp
+
+@COND_USE_GUI_1@monodll_overlaycmn.o: $(srcdir)/src/common/overlaycmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/overlaycmn.cpp
+
+@COND_USE_GUI_1@monodll_ownerdrwcmn.o: $(srcdir)/src/common/ownerdrwcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/ownerdrwcmn.cpp
+
+@COND_USE_GUI_1@monodll_paper.o: $(srcdir)/src/common/paper.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/paper.cpp
+
+@COND_USE_GUI_1@monodll_panelcmn.o: $(srcdir)/src/common/panelcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/panelcmn.cpp
+
+@COND_USE_GUI_1@monodll_persist.o: $(srcdir)/src/common/persist.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/persist.cpp
+
+@COND_USE_GUI_1@monodll_pickerbase.o: $(srcdir)/src/common/pickerbase.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/pickerbase.cpp
+
+@COND_USE_GUI_1@monodll_popupcmn.o: $(srcdir)/src/common/popupcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/popupcmn.cpp
+
+@COND_USE_GUI_1@monodll_prntbase.o: $(srcdir)/src/common/prntbase.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/prntbase.cpp
+
+@COND_USE_GUI_1@monodll_quantize.o: $(srcdir)/src/common/quantize.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/quantize.cpp
+
+@COND_USE_GUI_1@monodll_radiobtncmn.o: $(srcdir)/src/common/radiobtncmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/radiobtncmn.cpp
+
+@COND_USE_GUI_1@monodll_radiocmn.o: $(srcdir)/src/common/radiocmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/radiocmn.cpp
+
+@COND_USE_GUI_1@monodll_rearrangectrl.o: $(srcdir)/src/common/rearrangectrl.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/rearrangectrl.cpp
+
+@COND_USE_GUI_1@monodll_rendcmn.o: $(srcdir)/src/common/rendcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/rendcmn.cpp
+
+@COND_USE_GUI_1@monodll_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/rgncmn.cpp
+
+@COND_USE_GUI_1@monodll_scrolbarcmn.o: $(srcdir)/src/common/scrolbarcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/scrolbarcmn.cpp
+
+@COND_USE_GUI_1@monodll_settcmn.o: $(srcdir)/src/common/settcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/settcmn.cpp
+
+@COND_USE_GUI_1@monodll_sizer.o: $(srcdir)/src/common/sizer.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
+
+@COND_USE_GUI_1@monodll_slidercmn.o: $(srcdir)/src/common/slidercmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/slidercmn.cpp
+
+@COND_USE_GUI_1@monodll_spinbtncmn.o: $(srcdir)/src/common/spinbtncmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/spinbtncmn.cpp
+
+@COND_USE_GUI_1@monodll_spinctrlcmn.o: $(srcdir)/src/common/spinctrlcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/spinctrlcmn.cpp
+
+@COND_USE_GUI_1@monodll_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp
+
+@COND_USE_GUI_1@monodll_statbar.o: $(srcdir)/src/common/statbar.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/statbar.cpp
+
+@COND_USE_GUI_1@monodll_statbmpcmn.o: $(srcdir)/src/common/statbmpcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/statbmpcmn.cpp
+
+@COND_USE_GUI_1@monodll_statboxcmn.o: $(srcdir)/src/common/statboxcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/statboxcmn.cpp
+
+@COND_USE_GUI_1@monodll_statlinecmn.o: $(srcdir)/src/common/statlinecmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/statlinecmn.cpp
+
+@COND_USE_GUI_1@monodll_stattextcmn.o: $(srcdir)/src/common/stattextcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/stattextcmn.cpp
+
+@COND_USE_GUI_1@monodll_stockitem.o: $(srcdir)/src/common/stockitem.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/stockitem.cpp
+
+@COND_USE_GUI_1@monodll_tbarbase.o: $(srcdir)/src/common/tbarbase.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/tbarbase.cpp
+
+@COND_USE_GUI_1@monodll_textcmn.o: $(srcdir)/src/common/textcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/textcmn.cpp
+
+@COND_USE_GUI_1@monodll_textentrycmn.o: $(srcdir)/src/common/textentrycmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/textentrycmn.cpp
+
+@COND_USE_GUI_1@monodll_toplvcmn.o: $(srcdir)/src/common/toplvcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/toplvcmn.cpp
+
+@COND_USE_GUI_1@monodll_treebase.o: $(srcdir)/src/common/treebase.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/treebase.cpp
+
+@COND_USE_GUI_1@monodll_uiactioncmn.o: $(srcdir)/src/common/uiactioncmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/uiactioncmn.cpp
+
+@COND_USE_GUI_1@monodll_valgen.o: $(srcdir)/src/common/valgen.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/valgen.cpp
+
+@COND_USE_GUI_1@monodll_validate.o: $(srcdir)/src/common/validate.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/validate.cpp
+
+@COND_USE_GUI_1@monodll_valtext.o: $(srcdir)/src/common/valtext.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/valtext.cpp
+
+@COND_USE_GUI_1@monodll_valnum.o: $(srcdir)/src/common/valnum.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/valnum.cpp
+
+@COND_USE_GUI_1@monodll_wincmn.o: $(srcdir)/src/common/wincmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/wincmn.cpp
+
+@COND_USE_GUI_1@monodll_windowid.o: $(srcdir)/src/common/windowid.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/windowid.cpp
+
+@COND_USE_GUI_1@monodll_wrapsizer.o: $(srcdir)/src/common/wrapsizer.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/wrapsizer.cpp
+
+@COND_USE_GUI_1@monodll_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/xpmdecod.cpp
+
+@COND_USE_GUI_1@monodll_busyinfo.o: $(srcdir)/src/generic/busyinfo.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/busyinfo.cpp
+
+@COND_USE_GUI_1@monodll_generic_buttonbar.o: $(srcdir)/src/generic/buttonbar.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/buttonbar.cpp
+
+@COND_USE_GUI_1@monodll_choicdgg.o: $(srcdir)/src/generic/choicdgg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/choicdgg.cpp
+
+@COND_USE_GUI_1@monodll_choicbkg.o: $(srcdir)/src/generic/choicbkg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/choicbkg.cpp
+
+@COND_USE_GUI_1@monodll_combog.o: $(srcdir)/src/generic/combog.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/combog.cpp
+
+@COND_USE_GUI_1@monodll_dcpsg.o: $(srcdir)/src/generic/dcpsg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dcpsg.cpp
+
+@COND_USE_GUI_1@monodll_dirctrlg.o: $(srcdir)/src/generic/dirctrlg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dirctrlg.cpp
+
+@COND_USE_GUI_1@monodll_dragimgg.o: $(srcdir)/src/generic/dragimgg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/dragimgg.cpp
+
+@COND_USE_GUI_1@monodll_filectrlg.o: $(srcdir)/src/generic/filectrlg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/filectrlg.cpp
+
+@COND_USE_GUI_1@monodll_headerctrlg.o: $(srcdir)/src/generic/headerctrlg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/headerctrlg.cpp
+
+@COND_USE_GUI_1@monodll_generic_infobar.o: $(srcdir)/src/generic/infobar.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/infobar.cpp
+
+@COND_USE_GUI_1@monodll_listbkg.o: $(srcdir)/src/generic/listbkg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listbkg.cpp
+
+@COND_USE_GUI_1@monodll_logg.o: $(srcdir)/src/generic/logg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/logg.cpp
+
+@COND_USE_GUI_1@monodll_markuptext.o: $(srcdir)/src/generic/markuptext.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/markuptext.cpp
+
+@COND_USE_GUI_1@monodll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
+
+@COND_USE_GUI_1@monodll_numdlgg.o: $(srcdir)/src/generic/numdlgg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/numdlgg.cpp
+
+@COND_USE_GUI_1@monodll_panelg.o: $(srcdir)/src/generic/panelg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/panelg.cpp
  
  @COND_USE_GUI_1@monodll_progdlgg.o: $(srcdir)/src/generic/progdlgg.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/progdlgg.cpp
  
  @COND_USE_GUI_1@monodll_progdlgg.o: $(srcdir)/src/generic/progdlgg.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/progdlgg.cpp
@@ -18042,6 +20507,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@monodll_renderg.o: $(srcdir)/src/generic/renderg.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/renderg.cpp
  
  @COND_USE_GUI_1@monodll_renderg.o: $(srcdir)/src/generic/renderg.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/renderg.cpp
  
+@COND_USE_GUI_1@monodll_richmsgdlgg.o: $(srcdir)/src/generic/richmsgdlgg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/richmsgdlgg.cpp
+
  @COND_USE_GUI_1@monodll_scrlwing.o: $(srcdir)/src/generic/scrlwing.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/scrlwing.cpp
  
  @COND_USE_GUI_1@monodll_scrlwing.o: $(srcdir)/src/generic/scrlwing.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/scrlwing.cpp
  
@@ -18060,6 +20528,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@monodll_statbmpg.o: $(srcdir)/src/generic/statbmpg.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statbmpg.cpp
  
  @COND_USE_GUI_1@monodll_statbmpg.o: $(srcdir)/src/generic/statbmpg.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/statbmpg.cpp
  
+@COND_USE_GUI_1@monodll_stattextg.o: $(srcdir)/src/generic/stattextg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/stattextg.cpp
+
  @COND_USE_GUI_1@monodll_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp
  
  @COND_USE_GUI_1@monodll_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp
  
@@ -18093,18 +20564,30 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@monodll_datavcmn.o: $(srcdir)/src/common/datavcmn.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/datavcmn.cpp
  
  @COND_USE_GUI_1@monodll_datavcmn.o: $(srcdir)/src/common/datavcmn.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/datavcmn.cpp
  
+@COND_USE_GUI_1@monodll_gridcmn.o: $(srcdir)/src/common/gridcmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gridcmn.cpp
+
  @COND_USE_GUI_1@monodll_hyperlnkcmn.o: $(srcdir)/src/common/hyperlnkcmn.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/hyperlnkcmn.cpp
  
  @COND_USE_GUI_1@monodll_hyperlnkcmn.o: $(srcdir)/src/common/hyperlnkcmn.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/hyperlnkcmn.cpp
  
+@COND_USE_GUI_1@monodll_odcombocmn.o: $(srcdir)/src/common/odcombocmn.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/odcombocmn.cpp
+
  @COND_USE_GUI_1@monodll_aboutdlgg.o: $(srcdir)/src/generic/aboutdlgg.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/aboutdlgg.cpp
  
  @COND_USE_GUI_1@monodll_aboutdlgg.o: $(srcdir)/src/generic/aboutdlgg.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/aboutdlgg.cpp
  
+@COND_USE_GUI_1@monodll_bannerwindow.o: $(srcdir)/src/generic/bannerwindow.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/bannerwindow.cpp
+
  @COND_USE_GUI_1@monodll_bmpcboxg.o: $(srcdir)/src/generic/bmpcboxg.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/bmpcboxg.cpp
  
  @COND_USE_GUI_1@monodll_calctrlg.o: $(srcdir)/src/generic/calctrlg.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/calctrlg.cpp
  
  @COND_USE_GUI_1@monodll_bmpcboxg.o: $(srcdir)/src/generic/bmpcboxg.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/bmpcboxg.cpp
  
  @COND_USE_GUI_1@monodll_calctrlg.o: $(srcdir)/src/generic/calctrlg.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/calctrlg.cpp
  
+@COND_USE_GUI_1@monodll_commandlinkbuttong.o: $(srcdir)/src/generic/commandlinkbuttong.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/commandlinkbuttong.cpp
+
  @COND_USE_GUI_1@monodll_datavgen.o: $(srcdir)/src/generic/datavgen.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/datavgen.cpp
  
  @COND_USE_GUI_1@monodll_datavgen.o: $(srcdir)/src/generic/datavgen.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/datavgen.cpp
  
@@ -18120,6 +20603,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@monodll_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/gridctrl.cpp
  
  @COND_USE_GUI_1@monodll_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/gridctrl.cpp
  
+@COND_USE_GUI_1@monodll_grideditors.o: $(srcdir)/src/generic/grideditors.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/grideditors.cpp
+
  @COND_USE_GUI_1@monodll_gridsel.o: $(srcdir)/src/generic/gridsel.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/gridsel.cpp
  
  @COND_USE_GUI_1@monodll_gridsel.o: $(srcdir)/src/generic/gridsel.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/gridsel.cpp
  
@@ -18150,6 +20636,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@monodll_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/tipdlg.cpp
  
  @COND_USE_GUI_1@monodll_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/tipdlg.cpp
  
+@COND_USE_GUI_1@monodll_treelist.o: $(srcdir)/src/generic/treelist.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/treelist.cpp
+
  @COND_USE_GUI_1@monodll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/wizard.cpp
  
  @COND_USE_GUI_1@monodll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/wizard.cpp
  
@@ -18183,11 +20672,38 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
  
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/sound.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/sound.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_joystick.o: $(srcdir)/src/msw/joystick.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
  @COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
  @COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
@@ -18195,6 +20711,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_OSX_COCOA_USE_GUI_1@     $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
  @COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_OSX_COCOA_USE_GUI_1@     $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
+@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+
  @COND_TOOLKIT_COCOA_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
@@ -18210,89 +20729,95 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
  @COND_USE_GUI_1_WXUNIV_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_carbon_aboutdlg.o: $(srcdir)/src/osx/carbon/aboutdlg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/aboutdlg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_carbon_drawer.o: $(srcdir)/src/osx/carbon/drawer.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/drawer.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_aboutdlg.o: $(srcdir)/src/osx/carbon/aboutdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/aboutdlg.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_dataview_osx.o: $(srcdir)/src/osx/dataview_osx.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/dataview_osx.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_aboutdlg.o: $(srcdir)/src/osx/cocoa/aboutdlg.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@     $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/aboutdlg.mm
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_dataview_osx.o: $(srcdir)/src/osx/dataview_osx.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@     $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/dataview_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_carbon_dataview.o: $(srcdir)/src/osx/carbon/dataview.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dataview.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_sound_osx.o: $(srcdir)/src/osx/sound_osx.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/sound_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_sound_osx.o: $(srcdir)/src/osx/sound_osx.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@     $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/sound_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_notifmsg.o: $(srcdir)/src/gtk/hildon/notifmsg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/hildon/notifmsg.cpp
+@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1@monodll_sound_osx.o: $(srcdir)/src/osx/sound_osx.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/sound_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_carbon_sound.o: $(srcdir)/src/osx/carbon/sound.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/sound.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_carbon_sound.o: $(srcdir)/src/osx/carbon/sound.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@     $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/sound.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_taskbar.o: $(srcdir)/src/osx/carbon/taskbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_carbon_taskbar.o: $(srcdir)/src/osx/carbon/taskbar.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/taskbar.cpp
  
  @COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/taskbar.cpp
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_taskbar.o: $(srcdir)/src/osx/carbon/taskbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@     $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/taskbar.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
+
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@     $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_taskbar.o: $(srcdir)/src/cocoa/taskbar.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/taskbar.mm
+@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_taskbar.o: $(srcdir)/src/gtk/taskbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/taskbar.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_core_sound.o: $(srcdir)/src/osx/core/sound.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@     $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/sound.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_taskbar.o: $(srcdir)/src/gtk1/taskbar.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/taskbar.cpp
+@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1@monodll_core_sound.o: $(srcdir)/src/osx/core/sound.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/sound.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/msw/joystick.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_cocoa_aboutdlg.o: $(srcdir)/src/osx/cocoa/aboutdlg.mm $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@     $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/aboutdlg.mm
+
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_cocoa_dataview.o: $(srcdir)/src/osx/cocoa/dataview.mm $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@     $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dataview.mm
+
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_osx_cocoa_taskbar.o: $(srcdir)/src/osx/cocoa/taskbar.mm $(MONODLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@     $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/taskbar.mm
+
+@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_src_cocoa_taskbar.o: $(srcdir)/src/cocoa/taskbar.mm $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/taskbar.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
  @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
  @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
-
-@COND_TOOLKIT_PM_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/os2/joystick.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/joystick.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_dataview.o: $(srcdir)/src/osx/carbon/dataview.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dataview.cpp
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monodll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dataview.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_databrow.o: $(srcdir)/src/osx/carbon/databrow.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/databrow.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@     $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monodll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
  
  @COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
  
  @COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
@@ -18309,30 +20834,45 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP)
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
  
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP)
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_taskbar.o: $(srcdir)/src/gtk/taskbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/taskbar.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(MONODLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk/eggtrayicon.c
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk/eggtrayicon.c
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_eggtrayicon.o: $(srcdir)/src/gtk1/eggtrayicon.c $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_hildon_notifmsg.o: $(srcdir)/src/gtk/hildon/notifmsg.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/hildon/notifmsg.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_eggtrayicon.o: $(srcdir)/src/gtk1/eggtrayicon.c $(MONODLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk1/eggtrayicon.c
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk1/eggtrayicon.c
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_bmpcbox.o: $(srcdir)/src/gtk/bmpcbox.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/bmpcbox.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gtk1_taskbar.o: $(srcdir)/src/gtk1/taskbar.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/taskbar.cpp
+
+@COND_TOOLKIT_PM_USE_GUI_1@monodll_os2_joystick.o: $(srcdir)/src/os2/joystick.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/joystick.cpp
+
+@COND_TOOLKIT_PM_USE_GUI_1@monodll_os2_sound.o: $(srcdir)/src/os2/sound.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/sound.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/bmpcbox.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/bmpcbox.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/bmpcbox.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/bmpcbox.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monodll_calctrl.o: $(srcdir)/src/gtk/calctrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/calctrl.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
  
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
+
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp
  
@@ -18345,6 +20885,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp
  
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp
+
  @COND_TOOLKIT_MSW_USE_GUI_1@monodll_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@monodll_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp
  
@@ -18363,25 +20909,13 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@monodll_mediactrl_qt.o: $(srcdir)/src/msw/mediactrl_qt.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_qt.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@monodll_mediactrl_qt.o: $(srcdir)/src/msw/mediactrl_qt.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_qt.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_mediactrl.o: $(srcdir)/src/osx/carbon/mediactrl.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/mediactrl.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/mediactrl.mm
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
  
  @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
  
-@COND_TOOLKIT_GTK_USE_GUI_1@monodll_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_USE_GUI_1@monodll_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
  
  @COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
  
  @COND_PLATFORM_UNIX_1_USE_GUI_1@monodll_chm.o: $(srcdir)/src/html/chm.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
  
  @COND_PLATFORM_UNIX_1_USE_GUI_1@monodll_chm.o: $(srcdir)/src/html/chm.cpp $(MONODLL_ODEP)
@@ -18391,7 +20925,10 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_PLATFORM_MACOSX_1_USE_GUI_1@     $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/chm.cpp
  
  monodll_version_rc.o: $(srcdir)/src/msw/version.rc $(MONODLL_ODEP)
  @COND_PLATFORM_MACOSX_1_USE_GUI_1@     $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/chm.cpp
  
  monodll_version_rc.o: $(srcdir)/src/msw/version.rc $(MONODLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_54)  $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_55) $(__INC_REGEX_p_53) $(__INC_EXPAT_p_53) --define wxUSE_BASE=1 --define WXMAKINGDLL --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66)  $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define wxUSE_BASE=1 --define WXMAKINGDLL
+
+monolib_any.o: $(srcdir)/src/common/any.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/any.cpp
  
  monolib_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/appbase.cpp
  
  monolib_appbase.o: $(srcdir)/src/common/appbase.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/appbase.cpp
@@ -18426,6 +20963,9 @@ monolib_convauto.o: $(srcdir)/src/common/convauto.cpp $(MONOLIB_ODEP)
  monolib_datetime.o: $(srcdir)/src/common/datetime.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/datetime.cpp
  
  monolib_datetime.o: $(srcdir)/src/common/datetime.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/datetime.cpp
  
+monolib_datetimefmt.o: $(srcdir)/src/common/datetimefmt.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/datetimefmt.cpp
+
  monolib_datstrm.o: $(srcdir)/src/common/datstrm.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/datstrm.cpp
  
  monolib_datstrm.o: $(srcdir)/src/common/datstrm.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/datstrm.cpp
  
@@ -18501,6 +21041,9 @@ monolib_intl.o: $(srcdir)/src/common/intl.cpp $(MONOLIB_ODEP)
  monolib_ipcbase.o: $(srcdir)/src/common/ipcbase.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/ipcbase.cpp
  
  monolib_ipcbase.o: $(srcdir)/src/common/ipcbase.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/ipcbase.cpp
  
+monolib_languageinfo.o: $(srcdir)/src/common/languageinfo.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/languageinfo.cpp
+
  monolib_list.o: $(srcdir)/src/common/list.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/list.cpp
  
  monolib_list.o: $(srcdir)/src/common/list.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/list.cpp
  
@@ -18522,6 +21065,9 @@ monolib_module.o: $(srcdir)/src/common/module.cpp $(MONOLIB_ODEP)
  monolib_mstream.o: $(srcdir)/src/common/mstream.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/mstream.cpp
  
  monolib_mstream.o: $(srcdir)/src/common/mstream.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/mstream.cpp
  
+monolib_numformatter.o: $(srcdir)/src/common/numformatter.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/numformatter.cpp
+
  monolib_object.o: $(srcdir)/src/common/object.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/object.cpp
  
  monolib_object.o: $(srcdir)/src/common/object.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/object.cpp
  
@@ -18543,6 +21089,9 @@ monolib_stdpbase.o: $(srcdir)/src/common/stdpbase.cpp $(MONOLIB_ODEP)
  monolib_sstream.o: $(srcdir)/src/common/sstream.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/sstream.cpp
  
  monolib_sstream.o: $(srcdir)/src/common/sstream.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/sstream.cpp
  
+monolib_stdstream.o: $(srcdir)/src/common/stdstream.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/stdstream.cpp
+
  monolib_stopwatch.o: $(srcdir)/src/common/stopwatch.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/stopwatch.cpp
  
  monolib_stopwatch.o: $(srcdir)/src/common/stopwatch.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/stopwatch.cpp
  
@@ -18585,6 +21134,9 @@ monolib_timerimpl.o: $(srcdir)/src/common/timerimpl.cpp $(MONOLIB_ODEP)
  monolib_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/tokenzr.cpp
  
  monolib_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/tokenzr.cpp
  
+monolib_translation.o: $(srcdir)/src/common/translation.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/translation.cpp
+
  monolib_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/txtstrm.cpp
  
  monolib_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/txtstrm.cpp
  
@@ -18624,6 +21176,18 @@ monolib_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp $(MONOLIB_ODEP)
  monolib_zstream.o: $(srcdir)/src/common/zstream.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/zstream.cpp
  
  monolib_zstream.o: $(srcdir)/src/common/zstream.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/zstream.cpp
  
+monolib_fswatchercmn.o: $(srcdir)/src/common/fswatchercmn.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fswatchercmn.cpp
+
+monolib_fswatcherg.o: $(srcdir)/src/generic/fswatcherg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fswatcherg.cpp
+
+monolib_unix_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp
+
+monolib_fswatcher_inotify.o: $(srcdir)/src/unix/fswatcher_inotify.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fswatcher_inotify.cpp
+
  monolib_basemsw.o: $(srcdir)/src/msw/basemsw.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/basemsw.cpp
  
  monolib_basemsw.o: $(srcdir)/src/msw/basemsw.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/basemsw.cpp
  
@@ -18636,9 +21200,15 @@ monolib_debughlp.o: $(srcdir)/src/msw/debughlp.cpp $(MONOLIB_ODEP)
  monolib_dde.o: $(srcdir)/src/msw/dde.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dde.cpp
  
  monolib_dde.o: $(srcdir)/src/msw/dde.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dde.cpp
  
+monolib_msw_dir.o: $(srcdir)/src/msw/dir.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dir.cpp
+
  monolib_dlmsw.o: $(srcdir)/src/msw/dlmsw.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dlmsw.cpp
  
  monolib_dlmsw.o: $(srcdir)/src/msw/dlmsw.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dlmsw.cpp
  
+monolib_msw_mimetype.o: $(srcdir)/src/msw/mimetype.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mimetype.cpp
+
  monolib_power.o: $(srcdir)/src/msw/power.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/power.cpp
  
  monolib_power.o: $(srcdir)/src/msw/power.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/power.cpp
  
@@ -18648,14 +21218,41 @@ monolib_regconf.o: $(srcdir)/src/msw/regconf.cpp $(MONOLIB_ODEP)
  monolib_registry.o: $(srcdir)/src/msw/registry.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/registry.cpp
  
  monolib_registry.o: $(srcdir)/src/msw/registry.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/registry.cpp
  
+monolib_msw_snglinst.o: $(srcdir)/src/msw/snglinst.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/snglinst.cpp
+
+monolib_msw_stackwalk.o: $(srcdir)/src/msw/stackwalk.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/stackwalk.cpp
+
+monolib_msw_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/stdpaths.cpp
+
+monolib_msw_thread.o: $(srcdir)/src/msw/thread.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/thread.cpp
+
+monolib_msw_timer.o: $(srcdir)/src/msw/timer.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/timer.cpp
+
+monolib_msw_utils.o: $(srcdir)/src/msw/utils.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/utils.cpp
+
+monolib_msw_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/utilsexc.cpp
+
+monolib_fswatcher.o: $(srcdir)/src/msw/fswatcher.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fswatcher.cpp
+
  monolib_time.o: $(srcdir)/src/msw/wince/time.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/wince/time.cpp
  
  monolib_time.o: $(srcdir)/src/msw/wince/time.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/wince/time.cpp
  
+monolib_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp
+
  monolib_cfstring.o: $(srcdir)/src/osx/core/cfstring.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/cfstring.cpp
  
  monolib_cfstring.o: $(srcdir)/src/osx/core/cfstring.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/cfstring.cpp
  
-monolib_gsockosx.o: $(srcdir)/src/osx/core/gsockosx.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/gsockosx.cpp
+monolib_evtloop_cf.o: $(srcdir)/src/osx/core/evtloop_cf.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/evtloop_cf.cpp
  
  monolib_stdpaths_cf.o: $(srcdir)/src/osx/core/stdpaths_cf.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/stdpaths_cf.cpp
  
  monolib_stdpaths_cf.o: $(srcdir)/src/osx/core/stdpaths_cf.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/stdpaths_cf.cpp
@@ -18666,6 +21263,33 @@ monolib_strconv_cf.o: $(srcdir)/src/osx/core/strconv_cf.cpp $(MONOLIB_ODEP)
  monolib_utilsexc_base.o: $(srcdir)/src/osx/core/utilsexc_base.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_base.cpp
  
  monolib_utilsexc_base.o: $(srcdir)/src/osx/core/utilsexc_base.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_base.cpp
  
+monolib_os2_dir.o: $(srcdir)/src/os2/dir.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dir.cpp
+
+monolib_os2_mimetype.o: $(srcdir)/src/os2/mimetype.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/mimetype.cpp
+
+monolib_os2_snglinst.o: $(srcdir)/src/os2/snglinst.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/snglinst.cpp
+
+monolib_os2_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/stdpaths.cpp
+
+monolib_os2_thread.o: $(srcdir)/src/os2/thread.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/thread.cpp
+
+monolib_os2_utils.o: $(srcdir)/src/os2/utils.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/utils.cpp
+
+monolib_os2_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/utilsexc.cpp
+
+monolib_msdos_dir.o: $(srcdir)/src/msdos/dir.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msdos/dir.cpp
+
+monolib_msdos_mimetype.o: $(srcdir)/src/msdos/mimetype.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msdos/mimetype.cpp
+
  monolib_utilsdos.o: $(srcdir)/src/msdos/utilsdos.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msdos/utilsdos.cpp
  
  monolib_utilsdos.o: $(srcdir)/src/msdos/utilsdos.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msdos/utilsdos.cpp
  
@@ -18681,15 +21305,27 @@ monolib_msgout.o: $(srcdir)/src/common/msgout.cpp $(MONOLIB_ODEP)
  monolib_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/utilscmn.cpp
  
  monolib_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/utilscmn.cpp
  
+monolib_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
+
+monolib_msw_main.o: $(srcdir)/src/msw/main.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/main.cpp
+
  monolib_mslu.o: $(srcdir)/src/msw/mslu.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mslu.cpp
  
  monolib_volume.o: $(srcdir)/src/msw/volume.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/volume.cpp
  
  monolib_mslu.o: $(srcdir)/src/msw/mslu.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mslu.cpp
  
  monolib_volume.o: $(srcdir)/src/msw/volume.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/volume.cpp
  
+monolib_carbon_utils.o: $(srcdir)/src/osx/carbon/utils.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/utils.cpp
+
  monolib_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/uma.cpp
  
  monolib_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/uma.cpp
  
+monolib_osx_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm
+
  monolib_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp
  
  monolib_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp
  
@@ -18720,8 +21356,8 @@ monolib_socket.o: $(srcdir)/src/common/socket.cpp $(MONOLIB_ODEP)
  monolib_url.o: $(srcdir)/src/common/url.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/url.cpp
  
  monolib_url.o: $(srcdir)/src/common/url.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/url.cpp
  
-monolib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gsockmsw.cpp
+monolib_sockmsw.o: $(srcdir)/src/msw/sockmsw.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/sockmsw.cpp
  
  monolib_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/urlmsw.cpp
  
  monolib_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/urlmsw.cpp
@@ -18729,48 +21365,420 @@ monolib_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(MONOLIB_ODEP)
  monolib_net.o: $(srcdir)/src/msw/wince/net.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/wince/net.cpp
  
  monolib_net.o: $(srcdir)/src/msw/wince/net.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/wince/net.cpp
  
-monolib_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp
+monolib_sockosx.o: $(srcdir)/src/osx/core/sockosx.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/sockosx.cpp
+
+monolib_gtk_anybutton.o: $(srcdir)/src/gtk/anybutton.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/anybutton.cpp
  
  monolib_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp
  
  
  monolib_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp
  
+monolib_gtk_bmpbuttn.o: $(srcdir)/src/gtk/bmpbuttn.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/bmpbuttn.cpp
+
+monolib_gtk_button.o: $(srcdir)/src/gtk/button.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/button.cpp
+
+monolib_gtk_checkbox.o: $(srcdir)/src/gtk/checkbox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/checkbox.cpp
+
+monolib_gtk_checklst.o: $(srcdir)/src/gtk/checklst.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/checklst.cpp
+
+monolib_gtk_choice.o: $(srcdir)/src/gtk/choice.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/choice.cpp
+
  monolib_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp
  
  monolib_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp
  
+monolib_gtk_colordlg.o: $(srcdir)/src/gtk/colordlg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/colordlg.cpp
+
+monolib_gtk_combobox.o: $(srcdir)/src/gtk/combobox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/combobox.cpp
+
+monolib_gtk_control.o: $(srcdir)/src/gtk/control.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/control.cpp
+
  monolib_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp
  
  monolib_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp
  
+monolib_gtk_dialog.o: $(srcdir)/src/gtk/dialog.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dialog.cpp
+
  monolib_fontpicker.o: $(srcdir)/src/gtk/fontpicker.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/fontpicker.cpp
  
  monolib_filepicker.o: $(srcdir)/src/gtk/filepicker.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/filepicker.cpp
  
  monolib_fontpicker.o: $(srcdir)/src/gtk/fontpicker.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/fontpicker.cpp
  
  monolib_filepicker.o: $(srcdir)/src/gtk/filepicker.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/filepicker.cpp
  
+monolib_gtk_dirdlg.o: $(srcdir)/src/gtk/dirdlg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dirdlg.cpp
+
+monolib_gtk_filedlg.o: $(srcdir)/src/gtk/filedlg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/filedlg.cpp
+
+monolib_gtk_fontdlg.o: $(srcdir)/src/gtk/fontdlg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/fontdlg.cpp
+
+monolib_gtk_frame.o: $(srcdir)/src/gtk/frame.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/frame.cpp
+
+monolib_gtk_gauge.o: $(srcdir)/src/gtk/gauge.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/gauge.cpp
+
  monolib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/gnome/gprint.cpp
  
  monolib_gvfs.o: $(srcdir)/src/gtk/gnome/gvfs.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/gnome/gvfs.cpp
  
  monolib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/gnome/gprint.cpp
  
  monolib_gvfs.o: $(srcdir)/src/gtk/gnome/gvfs.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/gnome/gvfs.cpp
  
-monolib_mnemonics.o: $(srcdir)/src/gtk/mnemonics.cpp $(MONOLIB_ODEP)
+monolib_gtk_infobar.o: $(srcdir)/src/gtk/infobar.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/infobar.cpp
+
+monolib_gtk_listbox.o: $(srcdir)/src/gtk/listbox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/listbox.cpp
+
+monolib_gtk_mdi.o: $(srcdir)/src/gtk/mdi.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/mdi.cpp
+
+monolib_gtk_menu.o: $(srcdir)/src/gtk/menu.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/menu.cpp
+
+monolib_gtk_mnemonics.o: $(srcdir)/src/gtk/mnemonics.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/mnemonics.cpp
  
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/mnemonics.cpp
  
+monolib_gtk_msgdlg.o: $(srcdir)/src/gtk/msgdlg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/msgdlg.cpp
+
+monolib_gtk_nativewin.o: $(srcdir)/src/gtk/nativewin.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/nativewin.cpp
+
+monolib_gtk_notebook.o: $(srcdir)/src/gtk/notebook.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/notebook.cpp
+
+monolib_gtk_print.o: $(srcdir)/src/gtk/print.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/print.cpp
+
+monolib_gtk_radiobox.o: $(srcdir)/src/gtk/radiobox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/radiobox.cpp
+
+monolib_gtk_radiobut.o: $(srcdir)/src/gtk/radiobut.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/radiobut.cpp
+
+monolib_gtk_scrolbar.o: $(srcdir)/src/gtk/scrolbar.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/scrolbar.cpp
+
+monolib_gtk_scrolwin.o: $(srcdir)/src/gtk/scrolwin.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/scrolwin.cpp
+
+monolib_gtk_slider.o: $(srcdir)/src/gtk/slider.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/slider.cpp
+
+monolib_gtk_spinbutt.o: $(srcdir)/src/gtk/spinbutt.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/spinbutt.cpp
+
+monolib_gtk_spinctrl.o: $(srcdir)/src/gtk/spinctrl.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/spinctrl.cpp
+
+monolib_gtk_statbmp.o: $(srcdir)/src/gtk/statbmp.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/statbmp.cpp
+
+monolib_gtk_statbox.o: $(srcdir)/src/gtk/statbox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/statbox.cpp
+
+monolib_gtk_statline.o: $(srcdir)/src/gtk/statline.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/statline.cpp
+
+monolib_gtk_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/stattext.cpp
+
+monolib_gtk_toolbar.o: $(srcdir)/src/gtk/toolbar.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/toolbar.cpp
+
+monolib_gtk_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/textctrl.cpp
+
+monolib_gtk_textentry.o: $(srcdir)/src/gtk/textentry.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/textentry.cpp
+
+monolib_gtk_tglbtn.o: $(srcdir)/src/gtk/tglbtn.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/tglbtn.cpp
+
  monolib_treeentry_gtk.o: $(srcdir)/src/gtk/treeentry_gtk.c $(MONOLIB_ODEP)
         $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk/treeentry_gtk.c
  
  monolib_treeentry_gtk.o: $(srcdir)/src/gtk/treeentry_gtk.c $(MONOLIB_ODEP)
         $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk/treeentry_gtk.c
  
+monolib_gtk1_bmpbuttn.o: $(srcdir)/src/gtk1/bmpbuttn.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/bmpbuttn.cpp
+
+monolib_gtk1_button.o: $(srcdir)/src/gtk1/button.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/button.cpp
+
+monolib_gtk1_checkbox.o: $(srcdir)/src/gtk1/checkbox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/checkbox.cpp
+
+monolib_gtk1_checklst.o: $(srcdir)/src/gtk1/checklst.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/checklst.cpp
+
+monolib_gtk1_choice.o: $(srcdir)/src/gtk1/choice.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/choice.cpp
+
+monolib_gtk1_combobox.o: $(srcdir)/src/gtk1/combobox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/combobox.cpp
+
+monolib_gtk1_control.o: $(srcdir)/src/gtk1/control.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/control.cpp
+
+monolib_gtk1_dialog.o: $(srcdir)/src/gtk1/dialog.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/dialog.cpp
+
+monolib_gtk1_filedlg.o: $(srcdir)/src/gtk1/filedlg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/filedlg.cpp
+
+monolib_gtk1_fontdlg.o: $(srcdir)/src/gtk1/fontdlg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/fontdlg.cpp
+
+monolib_gtk1_frame.o: $(srcdir)/src/gtk1/frame.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/frame.cpp
+
+monolib_gtk1_gauge.o: $(srcdir)/src/gtk1/gauge.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/gauge.cpp
+
+monolib_gtk1_listbox.o: $(srcdir)/src/gtk1/listbox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/listbox.cpp
+
+monolib_gtk1_mdi.o: $(srcdir)/src/gtk1/mdi.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/mdi.cpp
+
+monolib_gtk1_menu.o: $(srcdir)/src/gtk1/menu.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/menu.cpp
+
+monolib_gtk1_mnemonics.o: $(srcdir)/src/gtk1/mnemonics.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/mnemonics.cpp
+
+monolib_gtk1_notebook.o: $(srcdir)/src/gtk1/notebook.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/notebook.cpp
+
+monolib_gtk1_radiobox.o: $(srcdir)/src/gtk1/radiobox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/radiobox.cpp
+
+monolib_gtk1_radiobut.o: $(srcdir)/src/gtk1/radiobut.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/radiobut.cpp
+
+monolib_gtk1_scrolbar.o: $(srcdir)/src/gtk1/scrolbar.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/scrolbar.cpp
+
+monolib_gtk1_scrolwin.o: $(srcdir)/src/gtk1/scrolwin.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/scrolwin.cpp
+
+monolib_gtk1_slider.o: $(srcdir)/src/gtk1/slider.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/slider.cpp
+
+monolib_gtk1_spinbutt.o: $(srcdir)/src/gtk1/spinbutt.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/spinbutt.cpp
+
+monolib_gtk1_spinctrl.o: $(srcdir)/src/gtk1/spinctrl.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/spinctrl.cpp
+
+monolib_gtk1_statbmp.o: $(srcdir)/src/gtk1/statbmp.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/statbmp.cpp
+
+monolib_gtk1_statbox.o: $(srcdir)/src/gtk1/statbox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/statbox.cpp
+
+monolib_gtk1_statline.o: $(srcdir)/src/gtk1/statline.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/statline.cpp
+
+monolib_gtk1_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp
+
+monolib_gtk1_toolbar.o: $(srcdir)/src/gtk1/toolbar.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/toolbar.cpp
+
+monolib_gtk1_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp
+
+monolib_gtk1_tglbtn.o: $(srcdir)/src/gtk1/tglbtn.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/tglbtn.cpp
+
+monolib_motif_accel.o: $(srcdir)/src/motif/accel.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/accel.cpp
+
+monolib_motif_app.o: $(srcdir)/src/motif/app.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/app.cpp
+
+monolib_motif_bmpbuttn.o: $(srcdir)/src/motif/bmpbuttn.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/bmpbuttn.cpp
+
  monolib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/bmpmotif.cpp
  
  monolib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/bmpmotif.cpp
  
+monolib_motif_button.o: $(srcdir)/src/motif/button.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/button.cpp
+
+monolib_motif_checkbox.o: $(srcdir)/src/motif/checkbox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/checkbox.cpp
+
+monolib_motif_checklst.o: $(srcdir)/src/motif/checklst.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/checklst.cpp
+
+monolib_motif_choice.o: $(srcdir)/src/motif/choice.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/choice.cpp
+
+monolib_motif_clipbrd.o: $(srcdir)/src/motif/clipbrd.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/clipbrd.cpp
+
+monolib_motif_colour.o: $(srcdir)/src/motif/colour.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/colour.cpp
+
+monolib_motif_combobox.o: $(srcdir)/src/motif/combobox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/combobox.cpp
+
  monolib_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/combobox_native.cpp
  
  monolib_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/combobox_native.cpp
  
-monolib_gsockmot.o: $(srcdir)/src/motif/gsockmot.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/gsockmot.cpp
+monolib_motif_control.o: $(srcdir)/src/motif/control.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/control.cpp
+
+monolib_motif_cursor.o: $(srcdir)/src/motif/cursor.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/cursor.cpp
+
+monolib_motif_data.o: $(srcdir)/src/motif/data.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/data.cpp
+
+monolib_motif_dataobj.o: $(srcdir)/src/motif/dataobj.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dataobj.cpp
+
+monolib_motif_dc.o: $(srcdir)/src/motif/dc.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dc.cpp
+
+monolib_motif_dcclient.o: $(srcdir)/src/motif/dcclient.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dcclient.cpp
+
+monolib_motif_dcmemory.o: $(srcdir)/src/motif/dcmemory.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dcmemory.cpp
+
+monolib_motif_dcscreen.o: $(srcdir)/src/motif/dcscreen.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dcscreen.cpp
+
+monolib_motif_dialog.o: $(srcdir)/src/motif/dialog.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dialog.cpp
+
+monolib_motif_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/evtloop.cpp
+
+monolib_motif_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/filedlg.cpp
+
+monolib_motif_font.o: $(srcdir)/src/motif/font.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/font.cpp
+
+monolib_motif_frame.o: $(srcdir)/src/motif/frame.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/frame.cpp
+
+monolib_motif_gauge.o: $(srcdir)/src/motif/gauge.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp
+
+monolib_sockmot.o: $(srcdir)/src/motif/sockmot.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/sockmot.cpp
+
+monolib_motif_icon.o: $(srcdir)/src/motif/icon.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/icon.cpp
+
+monolib_motif_listbox.o: $(srcdir)/src/motif/listbox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/listbox.cpp
+
+monolib_motif_main.o: $(srcdir)/src/motif/main.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/main.cpp
+
+monolib_motif_menu.o: $(srcdir)/src/motif/menu.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/menu.cpp
+
+monolib_motif_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/menuitem.cpp
+
+monolib_motif_minifram.o: $(srcdir)/src/motif/minifram.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/minifram.cpp
+
+monolib_motif_msgdlg.o: $(srcdir)/src/motif/msgdlg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/msgdlg.cpp
+
+monolib_motif_popupwin.o: $(srcdir)/src/motif/popupwin.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/popupwin.cpp
+
+monolib_motif_radiobox.o: $(srcdir)/src/motif/radiobox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/radiobox.cpp
+
+monolib_motif_radiobut.o: $(srcdir)/src/motif/radiobut.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/radiobut.cpp
+
+monolib_motif_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/scrolbar.cpp
+
+monolib_motif_settings.o: $(srcdir)/src/motif/settings.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/settings.cpp
+
+monolib_motif_slider.o: $(srcdir)/src/motif/slider.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/slider.cpp
+
+monolib_motif_spinbutt.o: $(srcdir)/src/motif/spinbutt.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/spinbutt.cpp
+
+monolib_motif_statbmp.o: $(srcdir)/src/motif/statbmp.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/statbmp.cpp
+
+monolib_motif_statbox.o: $(srcdir)/src/motif/statbox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/statbox.cpp
+
+monolib_motif_stattext.o: $(srcdir)/src/motif/stattext.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/stattext.cpp
+
+monolib_motif_textctrl.o: $(srcdir)/src/motif/textctrl.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/textctrl.cpp
+
+monolib_motif_textentry.o: $(srcdir)/src/motif/textentry.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/textentry.cpp
+
+monolib_motif_timer.o: $(srcdir)/src/motif/timer.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/timer.cpp
+
+monolib_motif_toolbar.o: $(srcdir)/src/motif/toolbar.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/toolbar.cpp
+
+monolib_motif_toplevel.o: $(srcdir)/src/motif/toplevel.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/toplevel.cpp
+
+monolib_motif_utils.o: $(srcdir)/src/motif/utils.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/utils.cpp
+
+monolib_motif_window.o: $(srcdir)/src/motif/window.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/window.cpp
  
  monolib_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(MONOLIB_ODEP)
         $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/motif/xmcombo/xmcombo.c
  
  
  monolib_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(MONOLIB_ODEP)
         $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/motif/xmcombo/xmcombo.c
  
+monolib_generic_notebook.o: $(srcdir)/src/generic/notebook.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/notebook.cpp
+
+monolib_generic_statline.o: $(srcdir)/src/generic/statline.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statline.cpp
+
+monolib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+
+monolib_msw_checklst.o: $(srcdir)/src/msw/checklst.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp
+
+monolib_msw_fdrepdlg.o: $(srcdir)/src/msw/fdrepdlg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fdrepdlg.cpp
+
+monolib_msw_fontdlg.o: $(srcdir)/src/msw/fontdlg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fontdlg.cpp
+
+monolib_wince_checklst.o: $(srcdir)/src/msw/wince/checklst.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/wince/checklst.cpp
+
  monolib_choicece.o: $(srcdir)/src/msw/wince/choicece.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/wince/choicece.cpp
  
  monolib_choicece.o: $(srcdir)/src/msw/wince/choicece.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/wince/choicece.cpp
  
@@ -18795,1730 +21803,1826 @@ monolib_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(MONOLIB_ODEP)
  monolib_textctrlce.o: $(srcdir)/src/msw/wince/textctrlce.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/wince/textctrlce.cpp
  
  monolib_textctrlce.o: $(srcdir)/src/msw/wince/textctrlce.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/wince/textctrlce.cpp
  
+monolib_carbon_anybutton.o: $(srcdir)/src/osx/carbon/anybutton.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/anybutton.cpp
+
+monolib_carbon_bmpbuttn.o: $(srcdir)/src/osx/carbon/bmpbuttn.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/bmpbuttn.cpp
+
+monolib_carbon_button.o: $(srcdir)/src/osx/carbon/button.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/button.cpp
+
+monolib_carbon_checkbox.o: $(srcdir)/src/osx/carbon/checkbox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/checkbox.cpp
+
+monolib_carbon_choice.o: $(srcdir)/src/osx/carbon/choice.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/choice.cpp
+
+monolib_carbon_colordlg.o: $(srcdir)/src/osx/carbon/colordlg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlg.cpp
+
+monolib_carbon_dialog.o: $(srcdir)/src/osx/carbon/dialog.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dialog.cpp
+
+monolib_carbon_dirdlg.o: $(srcdir)/src/osx/carbon/dirdlg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dirdlg.cpp
+
+monolib_carbon_dnd.o: $(srcdir)/src/osx/carbon/dnd.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dnd.cpp
+
+monolib_carbon_evtloop.o: $(srcdir)/src/osx/carbon/evtloop.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/evtloop.cpp
+
+monolib_carbon_filedlg.o: $(srcdir)/src/osx/carbon/filedlg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/filedlg.cpp
+
+monolib_carbon_gauge.o: $(srcdir)/src/osx/carbon/gauge.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gauge.cpp
+
+monolib_carbon_listbox.o: $(srcdir)/src/osx/carbon/listbox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/listbox.cpp
+
  monolib_listctrl_mac.o: $(srcdir)/src/osx/carbon/listctrl_mac.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/listctrl_mac.cpp
  
  monolib_listctrl_mac.o: $(srcdir)/src/osx/carbon/listctrl_mac.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/listctrl_mac.cpp
  
+monolib_carbon_menu.o: $(srcdir)/src/osx/carbon/menu.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/menu.cpp
+
+monolib_carbon_menuitem.o: $(srcdir)/src/osx/carbon/menuitem.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/menuitem.cpp
+
+monolib_carbon_msgdlg.o: $(srcdir)/src/osx/carbon/msgdlg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/msgdlg.cpp
+
+monolib_carbon_nonownedwnd.o: $(srcdir)/src/osx/carbon/nonownedwnd.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/nonownedwnd.cpp
+
  monolib_notebmac.o: $(srcdir)/src/osx/carbon/notebmac.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/notebmac.cpp
  
  monolib_notebmac.o: $(srcdir)/src/osx/carbon/notebmac.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/notebmac.cpp
  
+monolib_carbon_printdlg.o: $(srcdir)/src/osx/carbon/printdlg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/printdlg.cpp
+
+monolib_carbon_radiobut.o: $(srcdir)/src/osx/carbon/radiobut.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/radiobut.cpp
+
+monolib_carbon_scrolbar.o: $(srcdir)/src/osx/carbon/scrolbar.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/scrolbar.cpp
+
+monolib_carbon_slider.o: $(srcdir)/src/osx/carbon/slider.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/slider.cpp
+
+monolib_carbon_spinbutt.o: $(srcdir)/src/osx/carbon/spinbutt.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/spinbutt.cpp
+
+monolib_carbon_srchctrl.o: $(srcdir)/src/osx/carbon/srchctrl.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/srchctrl.cpp
+
+monolib_carbon_statbmp.o: $(srcdir)/src/osx/carbon/statbmp.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbmp.cpp
+
+monolib_carbon_statbox.o: $(srcdir)/src/osx/carbon/statbox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbox.cpp
+
  monolib_statlmac.o: $(srcdir)/src/osx/carbon/statlmac.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statlmac.cpp
  
  monolib_statlmac.o: $(srcdir)/src/osx/carbon/statlmac.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statlmac.cpp
  
-monolib_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm
+monolib_carbon_stattext.o: $(srcdir)/src/osx/carbon/stattext.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/stattext.cpp
  
  
-monolib_glcanvas.o: $(srcdir)/src/osx/cocoa/glcanvas.mm $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/glcanvas.mm
+monolib_carbon_textctrl.o: $(srcdir)/src/osx/carbon/textctrl.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/textctrl.cpp
  
  
-monolib_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSBox.mm
+monolib_carbon_tglbtn.o: $(srcdir)/src/osx/carbon/tglbtn.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tglbtn.cpp
  
  
-monolib_NSButton.o: $(srcdir)/src/cocoa/NSButton.mm $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSButton.mm
+monolib_carbon_toolbar.o: $(srcdir)/src/osx/carbon/toolbar.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/toolbar.cpp
  
  
-monolib_NSControl.o: $(srcdir)/src/cocoa/NSControl.mm $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSControl.mm
+monolib_carbon_tooltip.o: $(srcdir)/src/osx/carbon/tooltip.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tooltip.cpp
  
  
-monolib_NSMenu.o: $(srcdir)/src/cocoa/NSMenu.mm $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSMenu.mm
+monolib_carbon_window.o: $(srcdir)/src/osx/carbon/window.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/window.cpp
  
  
-monolib_NSPanel.o: $(srcdir)/src/cocoa/NSPanel.mm $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSPanel.mm
+monolib_cocoa_anybutton.o: $(srcdir)/src/osx/cocoa/anybutton.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/anybutton.mm
  
  
-monolib_NSScroller.o: $(srcdir)/src/cocoa/NSScroller.mm $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSScroller.mm
+monolib_osx_cocoa_button.o: $(srcdir)/src/osx/cocoa/button.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/button.mm
  
  
-monolib_NSSlider.o: $(srcdir)/src/cocoa/NSSlider.mm $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSSlider.mm
+monolib_osx_cocoa_checkbox.o: $(srcdir)/src/osx/cocoa/checkbox.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/checkbox.mm
  
  
-monolib_NSTabView.o: $(srcdir)/src/cocoa/NSTabView.mm $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSTabView.mm
+monolib_osx_cocoa_choice.o: $(srcdir)/src/osx/cocoa/choice.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/choice.mm
  
  
-monolib_NSTableView.o: $(srcdir)/src/cocoa/NSTableView.mm $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSTableView.mm
+monolib_osx_cocoa_colour.o: $(srcdir)/src/osx/cocoa/colour.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/colour.mm
  
  
-monolib_NSTextField.o: $(srcdir)/src/cocoa/NSTextField.mm $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSTextField.mm
+monolib_osx_cocoa_combobox.o: $(srcdir)/src/osx/cocoa/combobox.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/combobox.mm
  
  
-monolib_NSView.o: $(srcdir)/src/cocoa/NSView.mm $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSView.mm
+monolib_osx_cocoa_dialog.o: $(srcdir)/src/osx/cocoa/dialog.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dialog.mm
  
  
-monolib_NSWindow.o: $(srcdir)/src/cocoa/NSWindow.mm $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/NSWindow.mm
+monolib_osx_cocoa_dirdlg.o: $(srcdir)/src/osx/cocoa/dirdlg.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dirdlg.mm
  
  
-monolib_ObjcRef.o: $(srcdir)/src/cocoa/ObjcRef.mm $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/ObjcRef.mm
+monolib_cocoa_dnd.o: $(srcdir)/src/osx/cocoa/dnd.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dnd.mm
  
  
-monolib_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/mbarman.mm
+monolib_osx_cocoa_evtloop.o: $(srcdir)/src/osx/cocoa/evtloop.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/evtloop.mm
  
  
-monolib_statline2.o: $(srcdir)/src/cocoa/statline2.mm $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/statline2.mm
+monolib_osx_cocoa_filedlg.o: $(srcdir)/src/osx/cocoa/filedlg.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/filedlg.mm
  
  
-monolib_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/gsockpm.cpp
+monolib_osx_cocoa_gauge.o: $(srcdir)/src/osx/cocoa/gauge.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/gauge.mm
  
  
-monolib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/ctrlrend.cpp
+monolib_osx_cocoa_listbox.o: $(srcdir)/src/osx/cocoa/listbox.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/listbox.mm
  
  
-monolib_framuniv.o: $(srcdir)/src/univ/framuniv.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/framuniv.cpp
+monolib_osx_cocoa_menu.o: $(srcdir)/src/osx/cocoa/menu.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/menu.mm
  
  
-monolib_inpcons.o: $(srcdir)/src/univ/inpcons.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/inpcons.cpp
+monolib_osx_cocoa_menuitem.o: $(srcdir)/src/osx/cocoa/menuitem.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/menuitem.mm
  
  
-monolib_inphand.o: $(srcdir)/src/univ/inphand.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/inphand.cpp
+monolib_osx_cocoa_msgdlg.o: $(srcdir)/src/osx/cocoa/msgdlg.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/msgdlg.mm
  
  
-monolib_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/scrarrow.cpp
+monolib_cocoa_nonownedwnd.o: $(srcdir)/src/osx/cocoa/nonownedwnd.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/nonownedwnd.mm
+
+monolib_osx_cocoa_notebook.o: $(srcdir)/src/osx/cocoa/notebook.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/notebook.mm
+
+monolib_osx_cocoa_radiobut.o: $(srcdir)/src/osx/cocoa/radiobut.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/radiobut.mm
+
+monolib_cocoa_printdlg.o: $(srcdir)/src/osx/cocoa/printdlg.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/printdlg.mm
+
+monolib_osx_cocoa_scrolbar.o: $(srcdir)/src/osx/cocoa/scrolbar.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/scrolbar.mm
+
+monolib_osx_cocoa_slider.o: $(srcdir)/src/osx/cocoa/slider.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/slider.mm
+
+monolib_osx_cocoa_spinbutt.o: $(srcdir)/src/osx/cocoa/spinbutt.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/spinbutt.mm
+
+monolib_cocoa_srchctrl.o: $(srcdir)/src/osx/cocoa/srchctrl.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/srchctrl.mm
+
+monolib_osx_cocoa_statbox.o: $(srcdir)/src/osx/cocoa/statbox.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/statbox.mm
+
+monolib_cocoa_statline.o: $(srcdir)/src/osx/cocoa/statline.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/statline.mm
+
+monolib_osx_cocoa_stattext.o: $(srcdir)/src/osx/cocoa/stattext.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/stattext.mm
+
+monolib_osx_cocoa_textctrl.o: $(srcdir)/src/osx/cocoa/textctrl.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/textctrl.mm
+
+monolib_cocoa_tglbtn.o: $(srcdir)/src/osx/cocoa/tglbtn.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/tglbtn.mm
+
+monolib_osx_cocoa_toolbar.o: $(srcdir)/src/osx/cocoa/toolbar.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/toolbar.mm
  
  
-monolib_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/scrthumb.cpp
+monolib_osx_cocoa_tooltip.o: $(srcdir)/src/osx/cocoa/tooltip.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/tooltip.mm
  
  
-monolib_settingsuniv.o: $(srcdir)/src/univ/settingsuniv.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/settingsuniv.cpp
+monolib_osx_cocoa_window.o: $(srcdir)/src/osx/cocoa/window.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/window.mm
  
  
-monolib_stdrend.o: $(srcdir)/src/univ/stdrend.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/stdrend.cpp
+monolib_iphone_anybutton.o: $(srcdir)/src/osx/iphone/anybutton.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/anybutton.mm
  
  
-monolib_theme.o: $(srcdir)/src/univ/theme.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/theme.cpp
+monolib_iphone_button.o: $(srcdir)/src/osx/iphone/button.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/button.mm
  
  
-monolib_topluniv.o: $(srcdir)/src/univ/topluniv.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/topluniv.cpp
+monolib_iphone_checkbox.o: $(srcdir)/src/osx/iphone/checkbox.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/checkbox.mm
  
  
-monolib_winuniv.o: $(srcdir)/src/univ/winuniv.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/winuniv.cpp
+monolib_iphone_dialog.o: $(srcdir)/src/osx/iphone/dialog.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/dialog.mm
  
  
-monolib_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/themes/gtk.cpp
+monolib_iphone_evtloop.o: $(srcdir)/src/osx/iphone/evtloop.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/evtloop.mm
  
  
-monolib_metal.o: $(srcdir)/src/univ/themes/metal.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/themes/metal.cpp
+monolib_iphone_gauge.o: $(srcdir)/src/osx/iphone/gauge.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/gauge.mm
  
  
-monolib_mono.o: $(srcdir)/src/univ/themes/mono.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/themes/mono.cpp
+monolib_iphone_msgdlg.o: $(srcdir)/src/osx/iphone/msgdlg.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/msgdlg.mm
  
  
-monolib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/themes/win32.cpp
+monolib_iphone_nonownedwnd.o: $(srcdir)/src/osx/iphone/nonownedwnd.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/nonownedwnd.mm
  
  
-monolib_animate.o: $(srcdir)/src/gtk/animate.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/animate.cpp
+monolib_iphone_scrolbar.o: $(srcdir)/src/osx/iphone/scrolbar.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/scrolbar.mm
  
  
-monolib_hyperlink.o: $(srcdir)/src/gtk/hyperlink.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/hyperlink.cpp
+monolib_iphone_slider.o: $(srcdir)/src/osx/iphone/slider.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/slider.mm
  
  
-monolib_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp
+monolib_iphone_stattext.o: $(srcdir)/src/osx/iphone/stattext.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/stattext.mm
  
  
-monolib_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/helpbest.cpp
+monolib_iphone_textctrl.o: $(srcdir)/src/osx/iphone/textctrl.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/textctrl.mm
  
  
-monolib_helpctrl.o: $(srcdir)/src/html/helpctrl.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/helpctrl.cpp
+monolib_iphone_toolbar.o: $(srcdir)/src/osx/iphone/toolbar.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/toolbar.mm
  
  
-monolib_helpdata.o: $(srcdir)/src/html/helpdata.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/helpdata.cpp
+monolib_iphone_utils.o: $(srcdir)/src/osx/iphone/utils.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/utils.mm
  
  
-monolib_helpdlg.o: $(srcdir)/src/html/helpdlg.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/helpdlg.cpp
+monolib_iphone_window.o: $(srcdir)/src/osx/iphone/window.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/window.mm
  
  
-monolib_helpfrm.o: $(srcdir)/src/html/helpfrm.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/helpfrm.cpp
+monolib_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSBox.mm
  
  
-monolib_helpwnd.o: $(srcdir)/src/html/helpwnd.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/helpwnd.cpp
+monolib_NSButton.o: $(srcdir)/src/cocoa/NSButton.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSButton.mm
  
  
-monolib_htmlcell.o: $(srcdir)/src/html/htmlcell.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/htmlcell.cpp
+monolib_NSControl.o: $(srcdir)/src/cocoa/NSControl.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSControl.mm
  
  
-monolib_htmlfilt.o: $(srcdir)/src/html/htmlfilt.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/htmlfilt.cpp
+monolib_NSMenu.o: $(srcdir)/src/cocoa/NSMenu.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSMenu.mm
  
  
-monolib_htmlpars.o: $(srcdir)/src/html/htmlpars.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/htmlpars.cpp
+monolib_NSPanel.o: $(srcdir)/src/cocoa/NSPanel.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSPanel.mm
  
  
-monolib_htmltag.o: $(srcdir)/src/html/htmltag.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/htmltag.cpp
+monolib_NSScroller.o: $(srcdir)/src/cocoa/NSScroller.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSScroller.mm
  
  
-monolib_htmlwin.o: $(srcdir)/src/html/htmlwin.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/htmlwin.cpp
+monolib_NSSlider.o: $(srcdir)/src/cocoa/NSSlider.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSSlider.mm
  
  
-monolib_htmprint.o: $(srcdir)/src/html/htmprint.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/htmprint.cpp
+monolib_NSTabView.o: $(srcdir)/src/cocoa/NSTabView.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSTabView.mm
  
  
-monolib_m_dflist.o: $(srcdir)/src/html/m_dflist.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/m_dflist.cpp
+monolib_NSTableView.o: $(srcdir)/src/cocoa/NSTableView.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSTableView.mm
  
  
-monolib_m_fonts.o: $(srcdir)/src/html/m_fonts.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/m_fonts.cpp
+monolib_NSTextField.o: $(srcdir)/src/cocoa/NSTextField.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSTextField.mm
  
  
-monolib_m_hline.o: $(srcdir)/src/html/m_hline.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/m_hline.cpp
+monolib_NSView.o: $(srcdir)/src/cocoa/NSView.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSView.mm
  
  
-monolib_m_image.o: $(srcdir)/src/html/m_image.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/m_image.cpp
+monolib_NSWindow.o: $(srcdir)/src/cocoa/NSWindow.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSWindow.mm
  
  
-monolib_m_layout.o: $(srcdir)/src/html/m_layout.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/m_layout.cpp
+monolib_ObjcRef.o: $(srcdir)/src/cocoa/ObjcRef.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/ObjcRef.mm
  
  
-monolib_m_links.o: $(srcdir)/src/html/m_links.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/m_links.cpp
+monolib_cocoa_app.o: $(srcdir)/src/cocoa/app.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/app.mm
  
  
-monolib_m_list.o: $(srcdir)/src/html/m_list.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/m_list.cpp
+monolib_cocoa_bitmap.o: $(srcdir)/src/cocoa/bitmap.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/bitmap.mm
  
  
-monolib_m_pre.o: $(srcdir)/src/html/m_pre.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/m_pre.cpp
+monolib_cocoa_bmpbuttn.o: $(srcdir)/src/cocoa/bmpbuttn.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/bmpbuttn.mm
  
  
-monolib_m_style.o: $(srcdir)/src/html/m_style.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/m_style.cpp
+monolib_cocoa_brush.o: $(srcdir)/src/cocoa/brush.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/brush.mm
  
  
-monolib_m_tables.o: $(srcdir)/src/html/m_tables.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/m_tables.cpp
+monolib_src_cocoa_button.o: $(srcdir)/src/cocoa/button.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/button.mm
  
  
-monolib_winpars.o: $(srcdir)/src/html/winpars.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/winpars.cpp
+monolib_src_cocoa_checkbox.o: $(srcdir)/src/cocoa/checkbox.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/checkbox.mm
  
  
-monolib_htmllbox.o: $(srcdir)/src/generic/htmllbox.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/htmllbox.cpp
+monolib_cocoa_checklst.o: $(srcdir)/src/cocoa/checklst.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/checklst.mm
  
  
-monolib_debugrpt.o: $(srcdir)/src/common/debugrpt.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/debugrpt.cpp
+monolib_src_cocoa_choice.o: $(srcdir)/src/cocoa/choice.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/choice.mm
  
  
-monolib_dbgrptg.o: $(srcdir)/src/generic/dbgrptg.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dbgrptg.cpp
+monolib_cocoa_clipbrd.o: $(srcdir)/src/cocoa/clipbrd.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/clipbrd.mm
  
  
-monolib_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp
+monolib_cocoa_colordlg.o: $(srcdir)/src/cocoa/colordlg.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/colordlg.mm
  
  
-monolib_xh_bmp.o: $(srcdir)/src/xrc/xh_bmp.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_bmp.cpp
+monolib_src_cocoa_colour.o: $(srcdir)/src/cocoa/colour.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/colour.mm
  
  
-monolib_xh_bmpcbox.o: $(srcdir)/src/xrc/xh_bmpcbox.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_bmpcbox.cpp
+monolib_src_cocoa_combobox.o: $(srcdir)/src/cocoa/combobox.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/combobox.mm
  
  
-monolib_xh_bmpbt.o: $(srcdir)/src/xrc/xh_bmpbt.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_bmpbt.cpp
+monolib_cocoa_control.o: $(srcdir)/src/cocoa/control.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/control.mm
  
  
-monolib_xh_bttn.o: $(srcdir)/src/xrc/xh_bttn.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_bttn.cpp
+monolib_cocoa_cursor.o: $(srcdir)/src/cocoa/cursor.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/cursor.mm
  
  
-monolib_xh_cald.o: $(srcdir)/src/xrc/xh_cald.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_cald.cpp
+monolib_cocoa_data.o: $(srcdir)/src/cocoa/data.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/data.cpp
  
  
-monolib_xh_chckb.o: $(srcdir)/src/xrc/xh_chckb.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_chckb.cpp
+monolib_cocoa_dataobj.o: $(srcdir)/src/cocoa/dataobj.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/dataobj.mm
  
  
-monolib_xh_chckl.o: $(srcdir)/src/xrc/xh_chckl.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_chckl.cpp
+monolib_cocoa_dc.o: $(srcdir)/src/cocoa/dc.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/dc.mm
  
  
-monolib_xh_choic.o: $(srcdir)/src/xrc/xh_choic.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_choic.cpp
+monolib_cocoa_dcclient.o: $(srcdir)/src/cocoa/dcclient.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/dcclient.mm
  
  
-monolib_xh_choicbk.o: $(srcdir)/src/xrc/xh_choicbk.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_choicbk.cpp
+monolib_cocoa_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/dcmemory.mm
  
  
-monolib_xh_clrpicker.o: $(srcdir)/src/xrc/xh_clrpicker.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_clrpicker.cpp
+monolib_cocoa_dcscreen.o: $(srcdir)/src/cocoa/dcscreen.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/dcscreen.cpp
  
  
-monolib_xh_collpane.o: $(srcdir)/src/xrc/xh_collpane.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_collpane.cpp
+monolib_src_cocoa_dialog.o: $(srcdir)/src/cocoa/dialog.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/dialog.mm
  
  
-monolib_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp
+monolib_src_cocoa_dirdlg.o: $(srcdir)/src/cocoa/dirdlg.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/dirdlg.mm
  
  
-monolib_xh_datectrl.o: $(srcdir)/src/xrc/xh_datectrl.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_datectrl.cpp
+monolib_cocoa_display.o: $(srcdir)/src/cocoa/display.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/display.mm
  
  
-monolib_xh_dirpicker.o: $(srcdir)/src/xrc/xh_dirpicker.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_dirpicker.cpp
+monolib_cocoa_drawer.o: $(srcdir)/src/cocoa/drawer.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/drawer.mm
  
  
-monolib_xh_dlg.o: $(srcdir)/src/xrc/xh_dlg.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_dlg.cpp
+monolib_src_cocoa_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/evtloop.mm
  
  
-monolib_xh_frame.o: $(srcdir)/src/xrc/xh_frame.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_frame.cpp
+monolib_src_cocoa_filedlg.o: $(srcdir)/src/cocoa/filedlg.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/filedlg.mm
  
  
-monolib_xh_mdi.o: $(srcdir)/src/xrc/xh_mdi.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_mdi.cpp
+monolib_cocoa_font.o: $(srcdir)/src/cocoa/font.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/font.mm
  
  
-monolib_xh_filepicker.o: $(srcdir)/src/xrc/xh_filepicker.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_filepicker.cpp
+monolib_cocoa_fontdlg.o: $(srcdir)/src/cocoa/fontdlg.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/fontdlg.mm
  
  
-monolib_xh_fontpicker.o: $(srcdir)/src/xrc/xh_fontpicker.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_fontpicker.cpp
+monolib_cocoa_fontenum.o: $(srcdir)/src/cocoa/fontenum.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/fontenum.mm
  
  
-monolib_xh_gauge.o: $(srcdir)/src/xrc/xh_gauge.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_gauge.cpp
+monolib_cocoa_fontutil.o: $(srcdir)/src/cocoa/fontutil.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/fontutil.cpp
  
  
-monolib_xh_gdctl.o: $(srcdir)/src/xrc/xh_gdctl.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_gdctl.cpp
+monolib_cocoa_frame.o: $(srcdir)/src/cocoa/frame.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/frame.mm
  
  
-monolib_xh_grid.o: $(srcdir)/src/xrc/xh_grid.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_grid.cpp
+monolib_src_cocoa_gauge.o: $(srcdir)/src/cocoa/gauge.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/gauge.mm
  
  
-monolib_xh_html.o: $(srcdir)/src/xrc/xh_html.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_html.cpp
+monolib_cocoa_icon.o: $(srcdir)/src/cocoa/icon.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/icon.mm
  
  
-monolib_xh_hyperlink.o: $(srcdir)/src/xrc/xh_hyperlink.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_hyperlink.cpp
+monolib_src_cocoa_listbox.o: $(srcdir)/src/cocoa/listbox.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/listbox.mm
  
  
-monolib_xh_listb.o: $(srcdir)/src/xrc/xh_listb.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_listb.cpp
+monolib_cocoa_main.o: $(srcdir)/src/cocoa/main.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/main.cpp
  
  
-monolib_xh_listbk.o: $(srcdir)/src/xrc/xh_listbk.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_listbk.cpp
+monolib_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/mbarman.mm
  
  
-monolib_xh_listc.o: $(srcdir)/src/xrc/xh_listc.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_listc.cpp
+monolib_cocoa_mdi.o: $(srcdir)/src/cocoa/mdi.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/mdi.mm
  
  
-monolib_xh_menu.o: $(srcdir)/src/xrc/xh_menu.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_menu.cpp
+monolib_src_cocoa_menu.o: $(srcdir)/src/cocoa/menu.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/menu.mm
  
  
-monolib_xh_notbk.o: $(srcdir)/src/xrc/xh_notbk.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_notbk.cpp
+monolib_src_cocoa_menuitem.o: $(srcdir)/src/cocoa/menuitem.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/menuitem.mm
  
  
-monolib_xh_odcombo.o: $(srcdir)/src/xrc/xh_odcombo.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_odcombo.cpp
+monolib_src_cocoa_msgdlg.o: $(srcdir)/src/cocoa/msgdlg.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/msgdlg.mm
  
  
-monolib_xh_panel.o: $(srcdir)/src/xrc/xh_panel.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_panel.cpp
+monolib_src_cocoa_notebook.o: $(srcdir)/src/cocoa/notebook.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/notebook.mm
  
  
-monolib_xh_propdlg.o: $(srcdir)/src/xrc/xh_propdlg.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_propdlg.cpp
+monolib_cocoa_pen.o: $(srcdir)/src/cocoa/pen.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/pen.mm
  
  
-monolib_xh_radbt.o: $(srcdir)/src/xrc/xh_radbt.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_radbt.cpp
+monolib_cocoa_radiobox.o: $(srcdir)/src/cocoa/radiobox.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/radiobox.mm
  
  
-monolib_xh_radbx.o: $(srcdir)/src/xrc/xh_radbx.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_radbx.cpp
+monolib_src_cocoa_radiobut.o: $(srcdir)/src/cocoa/radiobut.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/radiobut.mm
  
  
-monolib_xh_scrol.o: $(srcdir)/src/xrc/xh_scrol.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_scrol.cpp
+monolib_cocoa_region.o: $(srcdir)/src/cocoa/region.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/region.mm
  
  
-monolib_xh_scwin.o: $(srcdir)/src/xrc/xh_scwin.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_scwin.cpp
+monolib_src_cocoa_scrolbar.o: $(srcdir)/src/cocoa/scrolbar.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/scrolbar.mm
  
  
-monolib_xh_htmllbox.o: $(srcdir)/src/xrc/xh_htmllbox.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_htmllbox.cpp
+monolib_cocoa_settings.o: $(srcdir)/src/cocoa/settings.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/settings.mm
  
  
-monolib_xh_sizer.o: $(srcdir)/src/xrc/xh_sizer.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_sizer.cpp
+monolib_src_cocoa_slider.o: $(srcdir)/src/cocoa/slider.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/slider.mm
  
  
-monolib_xh_slidr.o: $(srcdir)/src/xrc/xh_slidr.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_slidr.cpp
+monolib_cocoa_sound.o: $(srcdir)/src/cocoa/sound.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/sound.mm
  
  
-monolib_xh_spin.o: $(srcdir)/src/xrc/xh_spin.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_spin.cpp
+monolib_src_cocoa_spinbutt.o: $(srcdir)/src/cocoa/spinbutt.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/spinbutt.mm
  
  
-monolib_xh_split.o: $(srcdir)/src/xrc/xh_split.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_split.cpp
+monolib_cocoa_statbmp.o: $(srcdir)/src/cocoa/statbmp.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/statbmp.mm
  
  
-monolib_xh_srchctrl.o: $(srcdir)/src/xrc/xh_srchctrl.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_srchctrl.cpp
+monolib_src_cocoa_statbox.o: $(srcdir)/src/cocoa/statbox.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/statbox.mm
  
  
-monolib_xh_statbar.o: $(srcdir)/src/xrc/xh_statbar.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_statbar.cpp
+monolib_statline2.o: $(srcdir)/src/cocoa/statline2.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/statline2.mm
  
  
-monolib_xh_stbmp.o: $(srcdir)/src/xrc/xh_stbmp.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_stbmp.cpp
+monolib_src_cocoa_stattext.o: $(srcdir)/src/cocoa/stattext.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/stattext.mm
  
  
-monolib_xh_stbox.o: $(srcdir)/src/xrc/xh_stbox.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_stbox.cpp
+monolib_src_cocoa_textctrl.o: $(srcdir)/src/cocoa/textctrl.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/textctrl.mm
  
  
-monolib_xh_stlin.o: $(srcdir)/src/xrc/xh_stlin.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_stlin.cpp
+monolib_cocoa_timer.o: $(srcdir)/src/cocoa/timer.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/timer.mm
  
  
-monolib_xh_sttxt.o: $(srcdir)/src/xrc/xh_sttxt.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_sttxt.cpp
+monolib_src_cocoa_toolbar.o: $(srcdir)/src/cocoa/toolbar.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/toolbar.mm
  
  
-monolib_xh_text.o: $(srcdir)/src/xrc/xh_text.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_text.cpp
+monolib_src_cocoa_tooltip.o: $(srcdir)/src/cocoa/tooltip.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/tooltip.mm
  
  
-monolib_xh_tglbtn.o: $(srcdir)/src/xrc/xh_tglbtn.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_tglbtn.cpp
+monolib_cocoa_toplevel.o: $(srcdir)/src/cocoa/toplevel.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/toplevel.mm
  
  
-monolib_xh_toolb.o: $(srcdir)/src/xrc/xh_toolb.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_toolb.cpp
+monolib_src_cocoa_utils.o: $(srcdir)/src/cocoa/utils.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/utils.mm
  
  
-monolib_xh_tree.o: $(srcdir)/src/xrc/xh_tree.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_tree.cpp
+monolib_cocoa_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/utilsexc.mm
  
  
-monolib_xh_treebk.o: $(srcdir)/src/xrc/xh_treebk.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_treebk.cpp
+monolib_src_cocoa_window.o: $(srcdir)/src/cocoa/window.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/window.mm
  
  
-monolib_xh_unkwn.o: $(srcdir)/src/xrc/xh_unkwn.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_unkwn.cpp
+monolib_os2_accel.o: $(srcdir)/src/os2/accel.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/accel.cpp
  
  
-monolib_xh_wizrd.o: $(srcdir)/src/xrc/xh_wizrd.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_wizrd.cpp
+monolib_os2_app.o: $(srcdir)/src/os2/app.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/app.cpp
  
  
-monolib_xmlres.o: $(srcdir)/src/xrc/xmlres.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xmlres.cpp
+monolib_os2_bitmap.o: $(srcdir)/src/os2/bitmap.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/bitmap.cpp
  
  
-monolib_xmladv.o: $(srcdir)/src/xrc/xmladv.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xmladv.cpp
+monolib_os2_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/bmpbuttn.cpp
  
  
-monolib_xmlrsall.o: $(srcdir)/src/xrc/xmlrsall.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xmlrsall.cpp
+monolib_os2_brush.o: $(srcdir)/src/os2/brush.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/brush.cpp
  
  
-monolib_framemanager.o: $(srcdir)/src/aui/framemanager.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/aui/framemanager.cpp
+monolib_os2_button.o: $(srcdir)/src/os2/button.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/button.cpp
  
  
-monolib_dockart.o: $(srcdir)/src/aui/dockart.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/aui/dockart.cpp
+monolib_os2_checkbox.o: $(srcdir)/src/os2/checkbox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/checkbox.cpp
  
  
-monolib_floatpane.o: $(srcdir)/src/aui/floatpane.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/aui/floatpane.cpp
+monolib_os2_checklst.o: $(srcdir)/src/os2/checklst.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/checklst.cpp
  
  
-monolib_auibook.o: $(srcdir)/src/aui/auibook.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/aui/auibook.cpp
+monolib_os2_choice.o: $(srcdir)/src/os2/choice.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/choice.cpp
  
  
-monolib_auibar.o: $(srcdir)/src/aui/auibar.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/aui/auibar.cpp
+monolib_os2_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/clipbrd.cpp
  
  
-monolib_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/aui/tabmdi.cpp
+monolib_os2_colour.o: $(srcdir)/src/os2/colour.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/colour.cpp
  
  
-monolib_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp
+monolib_os2_combobox.o: $(srcdir)/src/os2/combobox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/combobox.cpp
  
  
-monolib_richtextbuffer.o: $(srcdir)/src/richtext/richtextbuffer.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextbuffer.cpp
+monolib_os2_control.o: $(srcdir)/src/os2/control.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/control.cpp
  
  
-monolib_richtextstyles.o: $(srcdir)/src/richtext/richtextstyles.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextstyles.cpp
+monolib_os2_cursor.o: $(srcdir)/src/os2/cursor.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/cursor.cpp
  
  
-monolib_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp
+monolib_os2_data.o: $(srcdir)/src/os2/data.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/data.cpp
  
  
-monolib_richtexthtml.o: $(srcdir)/src/richtext/richtexthtml.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtexthtml.cpp
+monolib_os2_dataobj.o: $(srcdir)/src/os2/dataobj.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dataobj.cpp
  
  
-monolib_richtextformatdlg.o: $(srcdir)/src/richtext/richtextformatdlg.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextformatdlg.cpp
+monolib_os2_dc.o: $(srcdir)/src/os2/dc.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dc.cpp
  
  
-monolib_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextsymboldlg.cpp
+monolib_os2_dcclient.o: $(srcdir)/src/os2/dcclient.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dcclient.cpp
  
  
-monolib_richtextstyledlg.o: $(srcdir)/src/richtext/richtextstyledlg.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextstyledlg.cpp
+monolib_os2_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dcmemory.cpp
  
  
-monolib_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp
+monolib_os2_dcprint.o: $(srcdir)/src/os2/dcprint.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dcprint.cpp
  
  
-monolib_stc.o: $(srcdir)/src/stc/stc.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/stc/stc.cpp
+monolib_os2_dcscreen.o: $(srcdir)/src/os2/dcscreen.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dcscreen.cpp
  
  
-monolib_PlatWX.o: $(srcdir)/src/stc/PlatWX.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/stc/PlatWX.cpp
+monolib_os2_dialog.o: $(srcdir)/src/os2/dialog.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dialog.cpp
  
  
-monolib_ScintillaWX.o: $(srcdir)/src/stc/ScintillaWX.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/stc/ScintillaWX.cpp
+monolib_os2_dnd.o: $(srcdir)/src/os2/dnd.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dnd.cpp
  
  
-monolib_xml.o: $(srcdir)/src/xml/xml.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xml/xml.cpp
+monolib_os2_evtloop.o: $(srcdir)/src/os2/evtloop.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/evtloop.cpp
  
  
-monolib_xtixml.o: $(srcdir)/src/common/xtixml.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/xtixml.cpp
+monolib_os2_filedlg.o: $(srcdir)/src/os2/filedlg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/filedlg.cpp
  
  
-monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound_sdl.cpp
+monolib_os2_font.o: $(srcdir)/src/os2/font.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/font.cpp
  
  
-@COND_PLATFORM_UNIX_1@monolib_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp
+monolib_os2_fontdlg.o: $(srcdir)/src/os2/fontdlg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/fontdlg.cpp
  
  
-@COND_PLATFORM_MACOSX_1@monolib_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp
+monolib_os2_fontenum.o: $(srcdir)/src/os2/fontenum.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/fontenum.cpp
  
  
-@COND_PLATFORM_OS2_1@monolib_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp
+monolib_os2_fontutil.o: $(srcdir)/src/os2/fontutil.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/fontutil.cpp
  
  
-@COND_PLATFORM_UNIX_1@monolib_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
+monolib_os2_frame.o: $(srcdir)/src/os2/frame.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/frame.cpp
  
  
-@COND_PLATFORM_MACOSX_1@monolib_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
+monolib_os2_gauge.o: $(srcdir)/src/os2/gauge.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/gauge.cpp
  
  
-@COND_PLATFORM_OS2_1@monolib_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
+monolib_os2_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/gdiimage.cpp
  
  
-@COND_PLATFORM_UNIX_1@monolib_epolldispatcher.o: $(srcdir)/src/unix/epolldispatcher.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/epolldispatcher.cpp
+monolib_sockpm.o: $(srcdir)/src/os2/sockpm.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/sockpm.cpp
  
  
-@COND_PLATFORM_MACOSX_1@monolib_epolldispatcher.o: $(srcdir)/src/unix/epolldispatcher.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/epolldispatcher.cpp
+monolib_os2_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/helpwin.cpp
  
  
-@COND_PLATFORM_UNIX_1@monolib_appunix.o: $(srcdir)/src/unix/appunix.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
+monolib_os2_icon.o: $(srcdir)/src/os2/icon.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/icon.cpp
  
  
-@COND_PLATFORM_MACOSX_1@monolib_appunix.o: $(srcdir)/src/unix/appunix.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
+monolib_os2_iniconf.o: $(srcdir)/src/os2/iniconf.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/iniconf.cpp
  
  
-@COND_PLATFORM_OS2_1@monolib_appunix.o: $(srcdir)/src/unix/appunix.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
+monolib_os2_listbox.o: $(srcdir)/src/os2/listbox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/listbox.cpp
  
  
-@COND_PLATFORM_UNIX_1@monolib_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
+monolib_os2_main.o: $(srcdir)/src/os2/main.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/main.cpp
  
  
-@COND_PLATFORM_MACOSX_1@monolib_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
+monolib_os2_menu.o: $(srcdir)/src/os2/menu.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/menu.cpp
  
  
-@COND_PLATFORM_OS2_1@monolib_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
+monolib_os2_menuitem.o: $(srcdir)/src/os2/menuitem.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/menuitem.cpp
  
  
-@COND_PLATFORM_UNIX_1@monolib_dir.o: $(srcdir)/src/unix/dir.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dir.cpp
+monolib_os2_metafile.o: $(srcdir)/src/os2/metafile.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/metafile.cpp
  
  
-@COND_PLATFORM_MACOSX_1@monolib_dir.o: $(srcdir)/src/unix/dir.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dir.cpp
+monolib_os2_minifram.o: $(srcdir)/src/os2/minifram.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/minifram.cpp
  
  
-@COND_PLATFORM_WIN32_1@monolib_dir.o: $(srcdir)/src/msw/dir.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dir.cpp
+monolib_os2_msgdlg.o: $(srcdir)/src/os2/msgdlg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/msgdlg.cpp
  
  
-@COND_PLATFORM_OS2_1@monolib_dir.o: $(srcdir)/src/os2/dir.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dir.cpp
+monolib_os2_nativdlg.o: $(srcdir)/src/os2/nativdlg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/nativdlg.cpp
  
  
-@COND_PLATFORM_MSDOS_1@monolib_dir.o: $(srcdir)/src/msdos/dir.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MSDOS_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msdos/dir.cpp
+monolib_os2_notebook.o: $(srcdir)/src/os2/notebook.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/notebook.cpp
  
  
-@COND_PLATFORM_UNIX_1@monolib_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
+monolib_os2_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/ownerdrw.cpp
  
  
-@COND_PLATFORM_MACOSX_1@monolib_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
+monolib_os2_palette.o: $(srcdir)/src/os2/palette.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/palette.cpp
  
  
-@COND_PLATFORM_UNIX_1@monolib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
+monolib_os2_pen.o: $(srcdir)/src/os2/pen.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/pen.cpp
  
  
-@COND_PLATFORM_MACOSX_1@monolib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
+monolib_os2_popupwin.o: $(srcdir)/src/os2/popupwin.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/popupwin.cpp
  
  
-@COND_PLATFORM_WIN32_1@monolib_snglinst.o: $(srcdir)/src/msw/snglinst.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/snglinst.cpp
+monolib_os2_print.o: $(srcdir)/src/os2/print.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/print.cpp
  
  
-@COND_PLATFORM_UNIX_1@monolib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/stdpaths.cpp
+monolib_os2_radiobox.o: $(srcdir)/src/os2/radiobox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/radiobox.cpp
  
  
-@COND_PLATFORM_MACOSX_1@monolib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/stdpaths.cpp
+monolib_os2_radiobut.o: $(srcdir)/src/os2/radiobut.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/radiobut.cpp
  
  
-@COND_PLATFORM_WIN32_1@monolib_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/stdpaths.cpp
+monolib_os2_region.o: $(srcdir)/src/os2/region.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/region.cpp
  
  
-@COND_PLATFORM_OS2_1@monolib_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/stdpaths.cpp
+monolib_os2_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/scrolbar.cpp
  
  
-@COND_PLATFORM_UNIX_1@monolib_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
+monolib_os2_settings.o: $(srcdir)/src/os2/settings.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/settings.cpp
  
  
-@COND_PLATFORM_MACOSX_1@monolib_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
+monolib_os2_slider.o: $(srcdir)/src/os2/slider.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/slider.cpp
  
  
-@COND_PLATFORM_OS2_1@monolib_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
+monolib_os2_spinbutt.o: $(srcdir)/src/os2/spinbutt.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/spinbutt.cpp
  
  
-@COND_PLATFORM_UNIX_1@monolib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/threadpsx.cpp
+monolib_os2_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/spinctrl.cpp
  
  
-@COND_PLATFORM_MACOSX_1@monolib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/threadpsx.cpp
+monolib_os2_statbmp.o: $(srcdir)/src/os2/statbmp.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/statbmp.cpp
  
  
-@COND_PLATFORM_UNIX_1@monolib_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/stackwalk.cpp
+monolib_os2_statbox.o: $(srcdir)/src/os2/statbox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/statbox.cpp
  
  
-@COND_PLATFORM_MACOSX_1@monolib_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/stackwalk.cpp
+monolib_os2_statline.o: $(srcdir)/src/os2/statline.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/statline.cpp
  
  
-@COND_PLATFORM_WIN32_1@monolib_stackwalk.o: $(srcdir)/src/msw/stackwalk.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/stackwalk.cpp
+monolib_os2_stattext.o: $(srcdir)/src/os2/stattext.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/stattext.cpp
  
  
-@COND_PLATFORM_UNIX_1@monolib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
+monolib_os2_textctrl.o: $(srcdir)/src/os2/textctrl.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/textctrl.cpp
  
  
-@COND_PLATFORM_MACOSX_1@monolib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
+monolib_os2_textentry.o: $(srcdir)/src/os2/textentry.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/textentry.cpp
  
  
-@COND_PLATFORM_UNIX_1@monolib_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp
+monolib_os2_tglbtn.o: $(srcdir)/src/os2/tglbtn.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/tglbtn.cpp
  
  
-@COND_PLATFORM_WIN32_1@monolib_mimetype.o: $(srcdir)/src/msw/mimetype.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mimetype.cpp
+monolib_os2_timer.o: $(srcdir)/src/os2/timer.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/timer.cpp
  
  
-@COND_PLATFORM_MACOSX_1@monolib_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp
+monolib_os2_toolbar.o: $(srcdir)/src/os2/toolbar.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/toolbar.cpp
  
  
-@COND_PLATFORM_OS2_1@monolib_mimetype.o: $(srcdir)/src/os2/mimetype.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/mimetype.cpp
+monolib_os2_tooltip.o: $(srcdir)/src/os2/tooltip.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/tooltip.cpp
  
  
-@COND_PLATFORM_MSDOS_1@monolib_mimetype.o: $(srcdir)/src/msdos/mimetype.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MSDOS_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msdos/mimetype.cpp
+monolib_os2_toplevel.o: $(srcdir)/src/os2/toplevel.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/toplevel.cpp
  
  
-@COND_PLATFORM_UNIX_1@monolib_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
+monolib_os2_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/utilsgui.cpp
  
  
-@COND_PLATFORM_OS2_1@monolib_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
+monolib_os2_window.o: $(srcdir)/src/os2/window.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/window.cpp
  
  
-@COND_PLATFORM_WIN32_1@monolib_thread.o: $(srcdir)/src/msw/thread.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/thread.cpp
+monolib_univ_bmpbuttn.o: $(srcdir)/src/univ/bmpbuttn.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/bmpbuttn.cpp
  
  
-@COND_PLATFORM_OS2_1@monolib_thread.o: $(srcdir)/src/os2/thread.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/thread.cpp
+monolib_univ_button.o: $(srcdir)/src/univ/button.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/button.cpp
  
  
-@COND_PLATFORM_WIN32_1@monolib_timer.o: $(srcdir)/src/msw/timer.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/timer.cpp
+monolib_univ_checkbox.o: $(srcdir)/src/univ/checkbox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/checkbox.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_timer.o: $(srcdir)/src/gtk/timer.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/timer.cpp
+monolib_univ_checklst.o: $(srcdir)/src/univ/checklst.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/checklst.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_timer.o: $(srcdir)/src/gtk1/timer.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/timer.cpp
+monolib_univ_choice.o: $(srcdir)/src/univ/choice.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/choice.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_timer.o: $(srcdir)/src/osx/core/timer.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
+monolib_univ_combobox.o: $(srcdir)/src/univ/combobox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/combobox.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_timer.o: $(srcdir)/src/osx/core/timer.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
+monolib_univ_control.o: $(srcdir)/src/univ/control.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/control.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_timer.o: $(srcdir)/src/generic/timer.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
+monolib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/ctrlrend.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_timer.o: $(srcdir)/src/generic/timer.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
+monolib_univ_dialog.o: $(srcdir)/src/univ/dialog.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/dialog.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_timer.o: $(srcdir)/src/generic/timer.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
+monolib_framuniv.o: $(srcdir)/src/univ/framuniv.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/framuniv.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_timer.o: $(srcdir)/src/motif/timer.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/timer.cpp
+monolib_univ_gauge.o: $(srcdir)/src/univ/gauge.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/gauge.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_timer.o: $(srcdir)/src/cocoa/timer.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/timer.mm
+monolib_inpcons.o: $(srcdir)/src/univ/inpcons.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/inpcons.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_timer.o: $(srcdir)/src/os2/timer.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/timer.cpp
+monolib_inphand.o: $(srcdir)/src/univ/inphand.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/inphand.cpp
  
  
-@COND_PLATFORM_WIN32_1@monolib_utils.o: $(srcdir)/src/msw/utils.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/utils.cpp
+monolib_univ_listbox.o: $(srcdir)/src/univ/listbox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/listbox.cpp
  
  
-@COND_PLATFORM_OS2_1@monolib_utils.o: $(srcdir)/src/os2/utils.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/utils.cpp
+monolib_univ_menu.o: $(srcdir)/src/univ/menu.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/menu.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON@monolib_utils.o: $(srcdir)/src/osx/carbon/utils.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/utils.cpp
+monolib_univ_notebook.o: $(srcdir)/src/univ/notebook.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/notebook.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA@monolib_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm
+monolib_univ_radiobox.o: $(srcdir)/src/univ/radiobox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/radiobox.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_utils.o: $(srcdir)/src/x11/utils.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/utils.cpp
+monolib_univ_radiobut.o: $(srcdir)/src/univ/radiobut.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/radiobut.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_utils.o: $(srcdir)/src/mgl/utils.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/utils.cpp
+monolib_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/scrarrow.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_utils.o: $(srcdir)/src/dfb/utils.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/utils.cpp
+monolib_univ_scrolbar.o: $(srcdir)/src/univ/scrolbar.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/scrolbar.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_utils.o: $(srcdir)/src/motif/utils.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/utils.cpp
+monolib_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/scrthumb.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_utils.o: $(srcdir)/src/cocoa/utils.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/utils.mm
+monolib_settingsuniv.o: $(srcdir)/src/univ/settingsuniv.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/settingsuniv.cpp
  
  
-@COND_PLATFORM_WIN32_1@monolib_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/utilsexc.cpp
+monolib_univ_slider.o: $(srcdir)/src/univ/slider.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/slider.cpp
  
  
-@COND_PLATFORM_OS2_1@monolib_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/utilsexc.cpp
+monolib_univ_spinbutt.o: $(srcdir)/src/univ/spinbutt.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/spinbutt.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/utilsexc.mm
+monolib_univ_statbmp.o: $(srcdir)/src/univ/statbmp.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/statbmp.cpp
  
  
-@COND_PLATFORM_WIN32_1@monolib_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
+monolib_univ_statbox.o: $(srcdir)/src/univ/statbox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/statbox.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/evtloop.cpp
+monolib_univ_statline.o: $(srcdir)/src/univ/statline.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/statline.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/gtk1/evtloop.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/evtloop.cpp
+monolib_univ_stattext.o: $(srcdir)/src/univ/stattext.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/stattext.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/x11/evtloop.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/evtloop.cpp
+monolib_univ_statusbr.o: $(srcdir)/src/univ/statusbr.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/statusbr.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/evtloop.cpp
+monolib_stdrend.o: $(srcdir)/src/univ/stdrend.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/stdrend.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/dfb/evtloop.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/evtloop.cpp
+monolib_univ_textctrl.o: $(srcdir)/src/univ/textctrl.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/textctrl.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/evtloop.cpp
+monolib_univ_tglbtn.o: $(srcdir)/src/univ/tglbtn.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/tglbtn.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_evtloop.o: $(srcdir)/src/osx/carbon/evtloop.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/evtloop.cpp
+monolib_theme.o: $(srcdir)/src/univ/theme.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/theme.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_evtloop.o: $(srcdir)/src/osx/cocoa/evtloop.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/evtloop.mm
+monolib_univ_toolbar.o: $(srcdir)/src/univ/toolbar.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/toolbar.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/evtloop.mm
+monolib_topluniv.o: $(srcdir)/src/univ/topluniv.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/topluniv.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_evtloop.o: $(srcdir)/src/os2/evtloop.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/evtloop.cpp
+monolib_winuniv.o: $(srcdir)/src/univ/winuniv.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/winuniv.cpp
  
  
-@COND_PLATFORM_WIN32_1@monolib_main.o: $(srcdir)/src/msw/main.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/main.cpp
+monolib_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/themes/gtk.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_main.o: $(srcdir)/src/gtk1/main.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/main.cpp
+monolib_metal.o: $(srcdir)/src/univ/themes/metal.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/themes/metal.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_main.o: $(srcdir)/src/motif/main.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/main.cpp
+monolib_mono.o: $(srcdir)/src/univ/themes/mono.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/themes/mono.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_main.o: $(srcdir)/src/cocoa/main.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/main.cpp
+monolib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/themes/win32.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_main.o: $(srcdir)/src/os2/main.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/main.cpp
+monolib_gtk_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp
  
  
-@COND_PLATFORM_UNIX_1@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
+monolib_animate.o: $(srcdir)/src/gtk/animate.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/animate.cpp
  
  
-@COND_PLATFORM_MACOSX_1@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
+monolib_gtk_bmpcbox.o: $(srcdir)/src/gtk/bmpcbox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/bmpcbox.cpp
  
  
-@COND_PLATFORM_OS2_1@monolib_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
+monolib_gtk_calctrl.o: $(srcdir)/src/gtk/calctrl.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/calctrl.cpp
  
  
-@COND_PLATFORM_WIN32_1@monolib_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gsocket.cpp
+monolib_gtk_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dataview.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monolib_gtk_hyperlink.o: $(srcdir)/src/gtk/hyperlink.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/hyperlink.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monolib_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monolib_carbon_mediactrl.o: $(srcdir)/src/osx/carbon/mediactrl.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/mediactrl.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monolib_cocoa_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/mediactrl.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monolib_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/helpbest.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monolib_helpctrl.o: $(srcdir)/src/html/helpctrl.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/helpctrl.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monolib_helpdata.o: $(srcdir)/src/html/helpdata.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/helpdata.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monolib_helpdlg.o: $(srcdir)/src/html/helpdlg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/helpdlg.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monolib_helpfrm.o: $(srcdir)/src/html/helpfrm.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/helpfrm.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+monolib_helpwnd.o: $(srcdir)/src/html/helpwnd.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/helpwnd.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_caret.o: $(srcdir)/src/msw/caret.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
+monolib_htmlcell.o: $(srcdir)/src/html/htmlcell.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/htmlcell.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_caret.o: $(srcdir)/src/msw/caret.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
+monolib_htmlfilt.o: $(srcdir)/src/html/htmlfilt.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/htmlfilt.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+monolib_htmlpars.o: $(srcdir)/src/html/htmlpars.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/htmlpars.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+monolib_htmltag.o: $(srcdir)/src/html/htmltag.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/htmltag.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+monolib_htmlwin.o: $(srcdir)/src/html/htmlwin.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/htmlwin.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+monolib_htmprint.o: $(srcdir)/src/html/htmprint.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/htmprint.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+monolib_m_dflist.o: $(srcdir)/src/html/m_dflist.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/m_dflist.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+monolib_m_fonts.o: $(srcdir)/src/html/m_fonts.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/m_fonts.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+monolib_m_hline.o: $(srcdir)/src/html/m_hline.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/m_hline.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+monolib_m_image.o: $(srcdir)/src/html/m_image.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/m_image.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
+monolib_m_layout.o: $(srcdir)/src/html/m_layout.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/m_layout.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
+monolib_m_links.o: $(srcdir)/src/html/m_links.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/m_links.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
+monolib_m_list.o: $(srcdir)/src/html/m_list.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/m_list.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
+monolib_m_pre.o: $(srcdir)/src/html/m_pre.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/m_pre.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+monolib_m_span.o: $(srcdir)/src/html/m_span.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/m_span.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+monolib_m_style.o: $(srcdir)/src/html/m_style.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/m_style.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+monolib_m_tables.o: $(srcdir)/src/html/m_tables.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/m_tables.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+monolib_styleparams.o: $(srcdir)/src/html/styleparams.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/styleparams.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_dialup.o: $(srcdir)/src/msw/dialup.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
+monolib_winpars.o: $(srcdir)/src/html/winpars.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/winpars.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_dialup.o: $(srcdir)/src/msw/dialup.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
+monolib_htmllbox.o: $(srcdir)/src/generic/htmllbox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/htmllbox.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
+monolib_webview_ie.o: $(srcdir)/src/msw/webview_ie.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/webview_ie.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
+monolib_gtk_webview_webkit.o: $(srcdir)/src/gtk/webview_webkit.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
+monolib_osx_webview_webkit.o: $(srcdir)/src/osx/webview_webkit.mm $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/webview_webkit.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
+monolib_webview.o: $(srcdir)/src/common/webview.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/webview.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
+monolib_webviewarchivehandler.o: $(srcdir)/src/common/webviewarchivehandler.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/webviewarchivehandler.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
+monolib_debugrpt.o: $(srcdir)/src/common/debugrpt.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/debugrpt.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
+monolib_dbgrptg.o: $(srcdir)/src/generic/dbgrptg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dbgrptg.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
+monolib_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_fontenum.o: $(srcdir)/src/mgl/fontenum.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/fontenum.cpp
+monolib_xh_bannerwindow.o: $(srcdir)/src/xrc/xh_bannerwindow.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_bannerwindow.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_fontenum.o: $(srcdir)/src/dfb/fontenum.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/fontenum.cpp
+monolib_xh_bmp.o: $(srcdir)/src/xrc/xh_bmp.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_bmp.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontenum.o: $(srcdir)/src/cocoa/fontenum.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/fontenum.mm
+monolib_xh_bmpcbox.o: $(srcdir)/src/xrc/xh_bmpcbox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_bmpcbox.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_fontenum.o: $(srcdir)/src/os2/fontenum.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/fontenum.cpp
+monolib_xh_bmpbt.o: $(srcdir)/src/xrc/xh_bmpbt.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_bmpbt.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
+monolib_xh_bttn.o: $(srcdir)/src/xrc/xh_bttn.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_bttn.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
+monolib_xh_cald.o: $(srcdir)/src/xrc/xh_cald.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_cald.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
+monolib_xh_chckb.o: $(srcdir)/src/xrc/xh_chckb.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_chckb.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
+monolib_xh_chckl.o: $(srcdir)/src/xrc/xh_chckl.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_chckl.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
+monolib_xh_choic.o: $(srcdir)/src/xrc/xh_choic.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_choic.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
+monolib_xh_choicbk.o: $(srcdir)/src/xrc/xh_choicbk.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_choicbk.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
+monolib_xh_clrpicker.o: $(srcdir)/src/xrc/xh_clrpicker.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_clrpicker.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
+monolib_xh_cmdlinkbn.o: $(srcdir)/src/xrc/xh_cmdlinkbn.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_cmdlinkbn.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_fontutil.o: $(srcdir)/src/mgl/fontutil.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/fontutil.cpp
+monolib_xh_collpane.o: $(srcdir)/src/xrc/xh_collpane.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_collpane.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontutil.o: $(srcdir)/src/cocoa/fontutil.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/fontutil.cpp
+monolib_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_fontutil.o: $(srcdir)/src/os2/fontutil.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/fontutil.cpp
+monolib_xh_comboctrl.o: $(srcdir)/src/xrc/xh_comboctrl.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_comboctrl.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
+monolib_xh_datectrl.o: $(srcdir)/src/xrc/xh_datectrl.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_datectrl.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
+monolib_xh_dirpicker.o: $(srcdir)/src/xrc/xh_dirpicker.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_dirpicker.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
+monolib_xh_dlg.o: $(srcdir)/src/xrc/xh_dlg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_dlg.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
+monolib_xh_editlbox.o: $(srcdir)/src/xrc/xh_editlbox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_editlbox.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+monolib_xh_filectrl.o: $(srcdir)/src/xrc/xh_filectrl.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_filectrl.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+monolib_xh_filepicker.o: $(srcdir)/src/xrc/xh_filepicker.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_filepicker.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+monolib_xh_fontpicker.o: $(srcdir)/src/xrc/xh_fontpicker.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_fontpicker.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+monolib_xh_frame.o: $(srcdir)/src/xrc/xh_frame.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_frame.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+monolib_xh_gauge.o: $(srcdir)/src/xrc/xh_gauge.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_gauge.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+monolib_xh_gdctl.o: $(srcdir)/src/xrc/xh_gdctl.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_gdctl.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+monolib_xh_grid.o: $(srcdir)/src/xrc/xh_grid.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_grid.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+monolib_xh_html.o: $(srcdir)/src/xrc/xh_html.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_html.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+monolib_xh_hyperlink.o: $(srcdir)/src/xrc/xh_hyperlink.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_hyperlink.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_icon.o: $(srcdir)/src/msw/icon.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
+monolib_xh_listb.o: $(srcdir)/src/xrc/xh_listb.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_listb.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_icon.o: $(srcdir)/src/msw/icon.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
+monolib_xh_listbk.o: $(srcdir)/src/xrc/xh_listbk.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_listbk.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_icon.o: $(srcdir)/src/motif/icon.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/icon.cpp
+monolib_xh_listc.o: $(srcdir)/src/xrc/xh_listc.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_listc.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
+monolib_xh_mdi.o: $(srcdir)/src/xrc/xh_mdi.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_mdi.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
+monolib_xh_menu.o: $(srcdir)/src/xrc/xh_menu.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_menu.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_icon.o: $(srcdir)/src/cocoa/icon.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/icon.mm
+monolib_xh_notbk.o: $(srcdir)/src/xrc/xh_notbk.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_notbk.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_icon.o: $(srcdir)/src/os2/icon.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/icon.cpp
+monolib_xh_odcombo.o: $(srcdir)/src/xrc/xh_odcombo.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_odcombo.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
+monolib_xh_panel.o: $(srcdir)/src/xrc/xh_panel.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_panel.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
+monolib_xh_propdlg.o: $(srcdir)/src/xrc/xh_propdlg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_propdlg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
+monolib_xh_radbt.o: $(srcdir)/src/xrc/xh_radbt.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_radbt.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_app.o: $(srcdir)/src/gtk/app.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/app.cpp
+monolib_xh_radbx.o: $(srcdir)/src/xrc/xh_radbx.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_radbx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_app.o: $(srcdir)/src/gtk1/app.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/app.cpp
+monolib_xh_scrol.o: $(srcdir)/src/xrc/xh_scrol.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_scrol.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_app.o: $(srcdir)/src/msw/app.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/app.cpp
+monolib_xh_scwin.o: $(srcdir)/src/xrc/xh_scwin.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_scwin.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_app.o: $(srcdir)/src/msw/app.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/app.cpp
+monolib_xh_htmllbox.o: $(srcdir)/src/xrc/xh_htmllbox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_htmllbox.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_app.o: $(srcdir)/src/x11/app.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/app.cpp
+monolib_xh_sizer.o: $(srcdir)/src/xrc/xh_sizer.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_sizer.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_app.o: $(srcdir)/src/mgl/app.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/app.cpp
+monolib_xh_slidr.o: $(srcdir)/src/xrc/xh_slidr.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_slidr.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_app.o: $(srcdir)/src/dfb/app.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/app.cpp
+monolib_xh_spin.o: $(srcdir)/src/xrc/xh_spin.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_spin.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_app.o: $(srcdir)/src/motif/app.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/app.cpp
+monolib_xh_split.o: $(srcdir)/src/xrc/xh_split.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_split.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_app.o: $(srcdir)/src/osx/carbon/app.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
+monolib_xh_srchctrl.o: $(srcdir)/src/xrc/xh_srchctrl.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_srchctrl.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_app.o: $(srcdir)/src/osx/carbon/app.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
+monolib_xh_statbar.o: $(srcdir)/src/xrc/xh_statbar.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_statbar.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_app.o: $(srcdir)/src/cocoa/app.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/app.mm
+monolib_xh_stbmp.o: $(srcdir)/src/xrc/xh_stbmp.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_stbmp.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_app.o: $(srcdir)/src/os2/app.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/app.cpp
+monolib_xh_stbox.o: $(srcdir)/src/xrc/xh_stbox.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_stbox.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.c $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.c
+monolib_xh_stlin.o: $(srcdir)/src/xrc/xh_stlin.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_stlin.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/bitmap.cpp
+monolib_xh_sttxt.o: $(srcdir)/src/xrc/xh_sttxt.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_sttxt.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/gtk1/bitmap.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/bitmap.cpp
+monolib_xh_text.o: $(srcdir)/src/xrc/xh_text.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_text.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
+monolib_xh_tglbtn.o: $(srcdir)/src/xrc/xh_tglbtn.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_tglbtn.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
+monolib_xh_toolb.o: $(srcdir)/src/xrc/xh_toolb.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_toolb.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
+monolib_xh_toolbk.o: $(srcdir)/src/xrc/xh_toolbk.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_toolbk.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
+monolib_xh_tree.o: $(srcdir)/src/xrc/xh_tree.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_tree.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
+monolib_xh_treebk.o: $(srcdir)/src/xrc/xh_treebk.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_treebk.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
+monolib_xh_unkwn.o: $(srcdir)/src/xrc/xh_unkwn.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_unkwn.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/bitmap.cpp
+monolib_xh_wizrd.o: $(srcdir)/src/xrc/xh_wizrd.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_wizrd.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_bitmap.o: $(srcdir)/src/dfb/bitmap.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/bitmap.cpp
+monolib_xmlres.o: $(srcdir)/src/xrc/xmlres.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xmlres.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_bitmap.o: $(srcdir)/src/cocoa/bitmap.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/bitmap.mm
+monolib_xmladv.o: $(srcdir)/src/xrc/xmladv.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xmladv.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_bitmap.o: $(srcdir)/src/os2/bitmap.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/bitmap.cpp
+monolib_xmlrsall.o: $(srcdir)/src/xrc/xmlrsall.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xmlrsall.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_brush.o: $(srcdir)/src/gtk/brush.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/brush.cpp
+monolib_framemanager.o: $(srcdir)/src/aui/framemanager.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/aui/framemanager.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_brush.o: $(srcdir)/src/gtk1/brush.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/brush.cpp
+monolib_dockart.o: $(srcdir)/src/aui/dockart.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/aui/dockart.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_brush.o: $(srcdir)/src/x11/brush.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
+monolib_floatpane.o: $(srcdir)/src/aui/floatpane.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/aui/floatpane.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_brush.o: $(srcdir)/src/x11/brush.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
+monolib_auibook.o: $(srcdir)/src/aui/auibook.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/aui/auibook.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_brush.o: $(srcdir)/src/msw/brush.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
+monolib_auibar.o: $(srcdir)/src/aui/auibar.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/aui/auibar.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_brush.o: $(srcdir)/src/msw/brush.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
+monolib_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/aui/tabmdi.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_brush.o: $(srcdir)/src/osx/brush.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
+monolib_advprops.o: $(srcdir)/src/propgrid/advprops.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/propgrid/advprops.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_brush.o: $(srcdir)/src/osx/brush.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
+monolib_editors.o: $(srcdir)/src/propgrid/editors.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/propgrid/editors.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_brush.o: $(srcdir)/src/mgl/brush.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/brush.cpp
+monolib_manager.o: $(srcdir)/src/propgrid/manager.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/propgrid/manager.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_brush.o: $(srcdir)/src/dfb/brush.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/brush.cpp
+monolib_property.o: $(srcdir)/src/propgrid/property.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/propgrid/property.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_brush.o: $(srcdir)/src/cocoa/brush.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/brush.mm
+monolib_propgrid.o: $(srcdir)/src/propgrid/propgrid.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/propgrid/propgrid.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_brush.o: $(srcdir)/src/os2/brush.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/brush.cpp
+monolib_propgridiface.o: $(srcdir)/src/propgrid/propgridiface.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/propgrid/propgridiface.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_clipbrd.o: $(srcdir)/src/gtk/clipbrd.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/clipbrd.cpp
+monolib_propgridpagestate.o: $(srcdir)/src/propgrid/propgridpagestate.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/propgrid/propgridpagestate.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_clipbrd.o: $(srcdir)/src/gtk1/clipbrd.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/clipbrd.cpp
+monolib_props.o: $(srcdir)/src/propgrid/props.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/propgrid/props.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
+monolib_art_internal.o: $(srcdir)/src/ribbon/art_internal.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/ribbon/art_internal.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
+monolib_art_msw.o: $(srcdir)/src/ribbon/art_msw.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/ribbon/art_msw.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_clipbrd.o: $(srcdir)/src/x11/clipbrd.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/clipbrd.cpp
+monolib_art_aui.o: $(srcdir)/src/ribbon/art_aui.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/ribbon/art_aui.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_clipbrd.o: $(srcdir)/src/mgl/clipbrd.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/clipbrd.cpp
+monolib_bar.o: $(srcdir)/src/ribbon/bar.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/ribbon/bar.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_clipbrd.o: $(srcdir)/src/motif/clipbrd.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/clipbrd.cpp
+monolib_ribbon_buttonbar.o: $(srcdir)/src/ribbon/buttonbar.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/ribbon/buttonbar.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
+monolib_ribbon_control.o: $(srcdir)/src/ribbon/control.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/ribbon/control.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
+monolib_gallery.o: $(srcdir)/src/ribbon/gallery.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/ribbon/gallery.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_clipbrd.o: $(srcdir)/src/cocoa/clipbrd.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/clipbrd.mm
+monolib_page.o: $(srcdir)/src/ribbon/page.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/ribbon/page.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/clipbrd.cpp
+monolib_ribbon_panel.o: $(srcdir)/src/ribbon/panel.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/ribbon/panel.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_colour.o: $(srcdir)/src/gtk/colour.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/colour.cpp
+monolib_ribbon_toolbar.o: $(srcdir)/src/ribbon/toolbar.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/ribbon/toolbar.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_colour.o: $(srcdir)/src/gtk1/colour.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/colour.cpp
+monolib_richtextbuffer.o: $(srcdir)/src/richtext/richtextbuffer.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextbuffer.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_colour.o: $(srcdir)/src/msw/colour.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
+monolib_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_colour.o: $(srcdir)/src/msw/colour.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
+monolib_richtextformatdlg.o: $(srcdir)/src/richtext/richtextformatdlg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextformatdlg.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_colour.o: $(srcdir)/src/osx/core/colour.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
+monolib_richtexthtml.o: $(srcdir)/src/richtext/richtexthtml.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtexthtml.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_colour.o: $(srcdir)/src/osx/core/colour.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
+monolib_richtextimagedlg.o: $(srcdir)/src/richtext/richtextimagedlg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextimagedlg.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_colour.o: $(srcdir)/src/x11/colour.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/colour.cpp
+monolib_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_colour.o: $(srcdir)/src/generic/colour.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
+monolib_richtextstyledlg.o: $(srcdir)/src/richtext/richtextstyledlg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextstyledlg.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_colour.o: $(srcdir)/src/generic/colour.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
+monolib_richtextstyles.o: $(srcdir)/src/richtext/richtextstyles.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextstyles.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_colour.o: $(srcdir)/src/motif/colour.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/colour.cpp
+monolib_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextsymboldlg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_colour.o: $(srcdir)/src/cocoa/colour.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/colour.mm
+monolib_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_colour.o: $(srcdir)/src/os2/colour.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/colour.cpp
+monolib_stc.o: $(srcdir)/src/stc/stc.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/stc/stc.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_cursor.o: $(srcdir)/src/gtk/cursor.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/cursor.cpp
+monolib_PlatWX.o: $(srcdir)/src/stc/PlatWX.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/stc/PlatWX.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_cursor.o: $(srcdir)/src/gtk1/cursor.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/cursor.cpp
+monolib_ScintillaWX.o: $(srcdir)/src/stc/ScintillaWX.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/stc/ScintillaWX.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_cursor.o: $(srcdir)/src/msw/cursor.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
+monolib_xml.o: $(srcdir)/src/xml/xml.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xml/xml.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_cursor.o: $(srcdir)/src/msw/cursor.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
+monolib_xtixml.o: $(srcdir)/src/common/xtixml.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/xtixml.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_cursor.o: $(srcdir)/src/x11/cursor.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/cursor.cpp
+monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound_sdl.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_cursor.o: $(srcdir)/src/mgl/cursor.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/cursor.cpp
+@COND_PLATFORM_UNIX_1@monolib_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_cursor.o: $(srcdir)/src/dfb/cursor.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/cursor.cpp
+@COND_PLATFORM_MACOSX_1@monolib_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_cursor.o: $(srcdir)/src/motif/cursor.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/cursor.cpp
+@COND_PLATFORM_OS2_1@monolib_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
+@COND_PLATFORM_UNIX_1@monolib_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
+@COND_PLATFORM_MACOSX_1@monolib_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_cursor.o: $(srcdir)/src/cocoa/cursor.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/cursor.mm
+@COND_PLATFORM_OS2_1@monolib_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_cursor.o: $(srcdir)/src/os2/cursor.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/cursor.cpp
+@COND_PLATFORM_UNIX_1@monolib_appunix.o: $(srcdir)/src/unix/appunix.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_dataobj.o: $(srcdir)/src/gtk/dataobj.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dataobj.cpp
+@COND_PLATFORM_MACOSX_1@monolib_appunix.o: $(srcdir)/src/unix/appunix.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_dataobj.o: $(srcdir)/src/gtk1/dataobj.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/dataobj.cpp
+@COND_PLATFORM_OS2_1@monolib_appunix.o: $(srcdir)/src/unix/appunix.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
+@COND_PLATFORM_UNIX_1@monolib_unix_dir.o: $(srcdir)/src/unix/dir.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dir.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
+@COND_PLATFORM_MACOSX_1@monolib_unix_dir.o: $(srcdir)/src/unix/dir.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dir.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_dataobj.o: $(srcdir)/src/x11/dataobj.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/dataobj.cpp
+@COND_PLATFORM_UNIX_1@monolib_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dataobj.o: $(srcdir)/src/motif/dataobj.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dataobj.cpp
+@COND_PLATFORM_MACOSX_1@monolib_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
+@COND_PLATFORM_UNIX_1@monolib_epolldispatcher.o: $(srcdir)/src/unix/epolldispatcher.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/epolldispatcher.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
+@COND_PLATFORM_MACOSX_1@monolib_epolldispatcher.o: $(srcdir)/src/unix/epolldispatcher.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/epolldispatcher.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_dataobj.o: $(srcdir)/src/cocoa/dataobj.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/dataobj.mm
+@COND_PLATFORM_UNIX_1@monolib_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dataobj.o: $(srcdir)/src/os2/dataobj.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dataobj.cpp
+@COND_PLATFORM_MACOSX_1@monolib_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_dc.o: $(srcdir)/src/gtk/dc.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dc.cpp
+@COND_PLATFORM_OS2_1@monolib_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_dc.o: $(srcdir)/src/gtk1/dc.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/dc.cpp
+@COND_PLATFORM_UNIX_1@monolib_fdiounix.o: $(srcdir)/src/unix/fdiounix.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fdiounix.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_dc.o: $(srcdir)/src/msw/dc.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
+@COND_PLATFORM_MACOSX_1@monolib_fdiounix.o: $(srcdir)/src/unix/fdiounix.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fdiounix.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_dc.o: $(srcdir)/src/msw/dc.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
+@COND_PLATFORM_UNIX_1@monolib_unix_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_dc.o: $(srcdir)/src/x11/dc.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/dc.cpp
+@COND_PLATFORM_MACOSX_1@monolib_unix_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_dc.o: $(srcdir)/src/mgl/dc.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/dc.cpp
+@COND_PLATFORM_UNIX_1@monolib_unix_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/stackwalk.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dc.o: $(srcdir)/src/dfb/dc.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/dc.cpp
+@COND_PLATFORM_MACOSX_1@monolib_unix_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/stackwalk.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dc.o: $(srcdir)/src/motif/dc.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dc.cpp
+@COND_PLATFORM_UNIX_1@monolib_unix_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/stdpaths.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_dc.o: $(srcdir)/src/cocoa/dc.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/dc.mm
+@COND_PLATFORM_MACOSX_1@monolib_unix_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/stdpaths.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dc.o: $(srcdir)/src/os2/dc.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dc.cpp
+@COND_PLATFORM_UNIX_1@monolib_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_dcclient.o: $(srcdir)/src/gtk/dcclient.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dcclient.cpp
+@COND_PLATFORM_MACOSX_1@monolib_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_dcclient.o: $(srcdir)/src/gtk1/dcclient.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/dcclient.cpp
+@COND_PLATFORM_OS2_1@monolib_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
+@COND_PLATFORM_UNIX_1@monolib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/threadpsx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
+@COND_PLATFORM_MACOSX_1@monolib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/threadpsx.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_dcclient.o: $(srcdir)/src/x11/dcclient.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/dcclient.cpp
+@COND_PLATFORM_UNIX_1@monolib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/dcclient.cpp
+@COND_PLATFORM_MACOSX_1@monolib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dcclient.o: $(srcdir)/src/dfb/dcclient.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/dcclient.cpp
+@COND_PLATFORM_UNIX_1@monolib_fswatcher_kqueue.o: $(srcdir)/src/unix/fswatcher_kqueue.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fswatcher_kqueue.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dcclient.o: $(srcdir)/src/motif/dcclient.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dcclient.cpp
+@COND_PLATFORM_MACOSX_1@monolib_fswatcher_kqueue.o: $(srcdir)/src/unix/fswatcher_kqueue.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fswatcher_kqueue.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
+@COND_PLATFORM_UNIX_1@monolib_socketiohandler.o: $(srcdir)/src/common/socketiohandler.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/socketiohandler.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
+@COND_PLATFORM_MACOSX_1@monolib_socketiohandler.o: $(srcdir)/src/common/socketiohandler.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/socketiohandler.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_dcclient.o: $(srcdir)/src/cocoa/dcclient.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/dcclient.mm
+@COND_PLATFORM_UNIX_1@monolib_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dcclient.o: $(srcdir)/src/os2/dcclient.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dcclient.cpp
+@COND_PLATFORM_MACOSX_1@monolib_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_dcmemory.o: $(srcdir)/src/gtk/dcmemory.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dcmemory.cpp
+@COND_PLATFORM_OS2_1@monolib_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_dcmemory.o: $(srcdir)/src/gtk1/dcmemory.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/dcmemory.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_dcmemory.o: $(srcdir)/src/x11/dcmemory.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/dcmemory.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/dcmemory.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dcmemory.o: $(srcdir)/src/dfb/dcmemory.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/dcmemory.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dcmemory.o: $(srcdir)/src/motif/dcmemory.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dcmemory.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/dcmemory.mm
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dcmemory.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_dcscreen.o: $(srcdir)/src/gtk/dcscreen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dcscreen.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_dcscreen.o: $(srcdir)/src/gtk1/dcscreen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/dcscreen.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_dcscreen.o: $(srcdir)/src/x11/dcscreen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/dcscreen.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_dcscreen.o: $(srcdir)/src/mgl/dcscreen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/dcscreen.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dcscreen.o: $(srcdir)/src/dfb/dcscreen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/dcscreen.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dcscreen.o: $(srcdir)/src/motif/dcscreen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dcscreen.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_dcscreen.o: $(srcdir)/src/cocoa/dcscreen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/dcscreen.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dcscreen.o: $(srcdir)/src/os2/dcscreen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dcscreen.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_dnd.o: $(srcdir)/src/gtk/dnd.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dnd.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_dnd.o: $(srcdir)/src/gtk1/dnd.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/dnd.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_dnd.o: $(srcdir)/src/osx/carbon/dnd.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dnd.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_dnd.o: $(srcdir)/src/osx/carbon/dnd.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dnd.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dnd.o: $(srcdir)/src/os2/dnd.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dnd.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_filectrl.o: $(srcdir)/src/gtk/filectrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/filectrl.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_font.o: $(srcdir)/src/gtk/font.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/font.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_font.o: $(srcdir)/src/gtk1/font.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/font.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_font.o: $(srcdir)/src/msw/font.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/font.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_font.o: $(srcdir)/src/msw/font.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/font.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_font.o: $(srcdir)/src/x11/font.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/font.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_font.o: $(srcdir)/src/mgl/font.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/font.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_font.o: $(srcdir)/src/dfb/font.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/font.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_uiactionx11.o: $(srcdir)/src/unix/uiactionx11.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/uiactionx11.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_font.o: $(srcdir)/src/motif/font.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/font.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_uiactionx11.o: $(srcdir)/src/unix/uiactionx11.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/uiactionx11.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_font.o: $(srcdir)/src/osx/carbon/font.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_uiactionx11.o: $(srcdir)/src/unix/uiactionx11.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/uiactionx11.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_font.o: $(srcdir)/src/osx/carbon/font.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_uiactionx11.o: $(srcdir)/src/unix/uiactionx11.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/uiactionx11.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_font.o: $(srcdir)/src/cocoa/font.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/font.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_font.o: $(srcdir)/src/os2/font.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/font.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/gsockgtk.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gsockgtk.o: $(srcdir)/src/gtk1/gsockgtk.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/gsockgtk.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_minifram.o: $(srcdir)/src/gtk/minifram.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/minifram.cpp
+@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_minifram.o: $(srcdir)/src/gtk1/minifram.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/minifram.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_minifram.o: $(srcdir)/src/msw/minifram.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_minifram.o: $(srcdir)/src/msw/minifram.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_minifram.o: $(srcdir)/src/osx/minifram.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_minifram.o: $(srcdir)/src/osx/minifram.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_minifram.o: $(srcdir)/src/x11/minifram.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/minifram.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_minifram.o: $(srcdir)/src/motif/minifram.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/minifram.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_minifram.o: $(srcdir)/src/os2/minifram.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/minifram.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_pen.o: $(srcdir)/src/gtk/pen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/pen.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_app.o: $(srcdir)/src/gtk/app.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/app.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_pen.o: $(srcdir)/src/gtk1/pen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/pen.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_pen.o: $(srcdir)/src/x11/pen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/bitmap.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_pen.o: $(srcdir)/src/x11/pen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_brush.o: $(srcdir)/src/gtk/brush.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/brush.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_pen.o: $(srcdir)/src/msw/pen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_clipbrd.o: $(srcdir)/src/gtk/clipbrd.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/clipbrd.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_pen.o: $(srcdir)/src/msw/pen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_colour.o: $(srcdir)/src/gtk/colour.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/colour.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_pen.o: $(srcdir)/src/osx/pen.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_cursor.o: $(srcdir)/src/gtk/cursor.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/cursor.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_pen.o: $(srcdir)/src/osx/pen.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_dataobj.o: $(srcdir)/src/gtk/dataobj.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dataobj.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_pen.o: $(srcdir)/src/mgl/pen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/pen.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_dc.o: $(srcdir)/src/gtk/dc.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dc.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_pen.o: $(srcdir)/src/dfb/pen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/pen.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_dcclient.o: $(srcdir)/src/gtk/dcclient.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dcclient.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_pen.o: $(srcdir)/src/cocoa/pen.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/pen.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_dcmemory.o: $(srcdir)/src/gtk/dcmemory.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dcmemory.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_pen.o: $(srcdir)/src/os2/pen.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/pen.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_dcscreen.o: $(srcdir)/src/gtk/dcscreen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dcscreen.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_popupwin.o: $(srcdir)/src/gtk/popupwin.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/popupwin.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_dnd.o: $(srcdir)/src/gtk/dnd.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dnd.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_popupwin.o: $(srcdir)/src/gtk1/popupwin.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/popupwin.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/evtloop.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_filectrl.o: $(srcdir)/src/gtk/filectrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/filectrl.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_filehistory.o: $(srcdir)/src/gtk/filehistory.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/filehistory.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_popupwin.o: $(srcdir)/src/x11/popupwin.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/popupwin.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_font.o: $(srcdir)/src/gtk/font.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/font.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_popupwin.o: $(srcdir)/src/motif/popupwin.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/popupwin.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_sockgtk.o: $(srcdir)/src/gtk/sockgtk.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/sockgtk.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_minifram.o: $(srcdir)/src/gtk/minifram.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/minifram.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_pen.o: $(srcdir)/src/gtk/pen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/pen.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_popupwin.o: $(srcdir)/src/os2/popupwin.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/popupwin.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_popupwin.o: $(srcdir)/src/gtk/popupwin.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/popupwin.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_private.o: $(srcdir)/src/gtk/private.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/private.cpp
  
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_private.o: $(srcdir)/src/gtk/private.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/private.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_region.o: $(srcdir)/src/gtk/region.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_region.o: $(srcdir)/src/gtk/region.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/region.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/region.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_region.o: $(srcdir)/src/gtk1/region.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/region.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_region.o: $(srcdir)/src/x11/region.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/region.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_region.o: $(srcdir)/src/x11/region.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/region.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_region.o: $(srcdir)/src/msw/region.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/region.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_region.o: $(srcdir)/src/msw/region.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/region.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_renderer.o: $(srcdir)/src/gtk/renderer.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/renderer.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_region.o: $(srcdir)/src/mgl/region.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/region.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_settings.o: $(srcdir)/src/gtk/settings.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/settings.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_region.o: $(srcdir)/src/dfb/region.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/region.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_timer.o: $(srcdir)/src/gtk/timer.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/timer.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_region.o: $(srcdir)/src/osx/carbon/region.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/region.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_tooltip.o: $(srcdir)/src/gtk/tooltip.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/tooltip.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_region.o: $(srcdir)/src/cocoa/region.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/region.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_toplevel.o: $(srcdir)/src/gtk/toplevel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/toplevel.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_region.o: $(srcdir)/src/os2/region.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/region.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_utilsgtk.o: $(srcdir)/src/gtk/utilsgtk.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/utilsgtk.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_renderer.o: $(srcdir)/src/gtk/renderer.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/renderer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_win_gtk.o: $(srcdir)/src/gtk/win_gtk.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/win_gtk.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_renderer.o: $(srcdir)/src/gtk1/renderer.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/renderer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_window.o: $(srcdir)/src/gtk/window.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/window.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_renderer.o: $(srcdir)/src/msw/renderer.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_app.o: $(srcdir)/src/gtk1/app.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/app.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_renderer.o: $(srcdir)/src/msw/renderer.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_bitmap.o: $(srcdir)/src/gtk1/bitmap.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/bitmap.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_brush.o: $(srcdir)/src/gtk1/brush.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/brush.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_clipbrd.o: $(srcdir)/src/gtk1/clipbrd.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/clipbrd.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_settings.o: $(srcdir)/src/gtk/settings.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_colour.o: $(srcdir)/src/gtk1/colour.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/colour.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_settings.o: $(srcdir)/src/gtk1/settings.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_cursor.o: $(srcdir)/src/gtk1/cursor.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/cursor.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_settings.o: $(srcdir)/src/msw/settings.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_data.o: $(srcdir)/src/gtk1/data.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/data.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_settings.o: $(srcdir)/src/msw/settings.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_dataobj.o: $(srcdir)/src/gtk1/dataobj.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/dataobj.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_settings.o: $(srcdir)/src/x11/settings.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_dc.o: $(srcdir)/src/gtk1/dc.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/dc.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_settings.o: $(srcdir)/src/mgl/settings.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_dcclient.o: $(srcdir)/src/gtk1/dcclient.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/dcclient.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_settings.o: $(srcdir)/src/dfb/settings.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_dcmemory.o: $(srcdir)/src/gtk1/dcmemory.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/dcmemory.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_settings.o: $(srcdir)/src/motif/settings.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_dcscreen.o: $(srcdir)/src/gtk1/dcscreen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/dcscreen.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_dnd.o: $(srcdir)/src/gtk1/dnd.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/dnd.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_evtloop.o: $(srcdir)/src/gtk1/evtloop.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/evtloop.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_settings.o: $(srcdir)/src/cocoa/settings.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/settings.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_font.o: $(srcdir)/src/gtk1/font.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/font.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_settings.o: $(srcdir)/src/os2/settings.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_sockgtk.o: $(srcdir)/src/gtk1/sockgtk.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/sockgtk.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_tooltip.o: $(srcdir)/src/gtk/tooltip.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/tooltip.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_main.o: $(srcdir)/src/gtk1/main.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/main.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_tooltip.o: $(srcdir)/src/gtk1/tooltip.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/tooltip.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_minifram.o: $(srcdir)/src/gtk1/minifram.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/minifram.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_pen.o: $(srcdir)/src/gtk1/pen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/pen.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_popupwin.o: $(srcdir)/src/gtk1/popupwin.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/popupwin.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_tooltip.o: $(srcdir)/src/osx/carbon/tooltip.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tooltip.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_region.o: $(srcdir)/src/gtk1/region.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/region.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_tooltip.o: $(srcdir)/src/osx/carbon/tooltip.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tooltip.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_renderer.o: $(srcdir)/src/gtk1/renderer.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/renderer.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_tooltip.o: $(srcdir)/src/cocoa/tooltip.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/tooltip.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_settings.o: $(srcdir)/src/gtk1/settings.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/settings.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_tooltip.o: $(srcdir)/src/os2/tooltip.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/tooltip.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_timer.o: $(srcdir)/src/gtk1/timer.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/timer.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_toplevel.o: $(srcdir)/src/gtk/toplevel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/toplevel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_tooltip.o: $(srcdir)/src/gtk1/tooltip.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/tooltip.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_toplevel.o: $(srcdir)/src/gtk1/toplevel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_toplevel.o: $(srcdir)/src/gtk1/toplevel.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/toplevel.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/toplevel.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_toplevel.o: $(srcdir)/src/x11/toplevel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/toplevel.cpp
-
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_toplevel.o: $(srcdir)/src/mgl/toplevel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/toplevel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_utilsgtk.o: $(srcdir)/src/gtk1/utilsgtk.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/utilsgtk.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_toplevel.o: $(srcdir)/src/dfb/toplevel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/toplevel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_win_gtk.o: $(srcdir)/src/gtk1/win_gtk.c $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk1/win_gtk.c
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_toplevel.o: $(srcdir)/src/motif/toplevel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/toplevel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_window.o: $(srcdir)/src/gtk1/window.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/window.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_toplevel.o: $(srcdir)/src/cocoa/toplevel.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/toplevel.mm
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_toplevel.o: $(srcdir)/src/os2/toplevel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/toplevel.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_utilsgtk.o: $(srcdir)/src/gtk/utilsgtk.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/utilsgtk.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_x11_brush.o: $(srcdir)/src/x11/brush.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_utilsgtk.o: $(srcdir)/src/gtk1/utilsgtk.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/utilsgtk.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_brush.o: $(srcdir)/src/x11/brush.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_win_gtk.o: $(srcdir)/src/gtk/win_gtk.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/win_gtk.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_x11_palette.o: $(srcdir)/src/x11/palette.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_win_gtk.o: $(srcdir)/src/gtk1/win_gtk.c $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk1/win_gtk.c
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_palette.o: $(srcdir)/src/x11/palette.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_window.o: $(srcdir)/src/gtk/window.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/window.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_x11_pen.o: $(srcdir)/src/x11/pen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_window.o: $(srcdir)/src/gtk1/window.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/window.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_pen.o: $(srcdir)/src/x11/pen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_window.o: $(srcdir)/src/msw/window.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/window.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_x11_region.o: $(srcdir)/src/x11/region.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/region.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_window.o: $(srcdir)/src/msw/window.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/window.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_region.o: $(srcdir)/src/x11/region.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/region.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_window.o: $(srcdir)/src/x11/window.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/window.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_window.o: $(srcdir)/src/mgl/window.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/window.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_window.o: $(srcdir)/src/dfb/window.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/window.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_window.o: $(srcdir)/src/motif/window.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/window.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_window.o: $(srcdir)/src/osx/carbon/window.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/window.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_app.o: $(srcdir)/src/msw/app.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/app.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_window.o: $(srcdir)/src/osx/cocoa/window.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/window.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_app.o: $(srcdir)/src/msw/app.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/app.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_window.o: $(srcdir)/src/cocoa/window.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/window.mm
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_window.o: $(srcdir)/src/os2/window.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/window.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_data.o: $(srcdir)/src/gtk1/data.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/data.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_brush.o: $(srcdir)/src/msw/brush.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_data.o: $(srcdir)/src/msw/data.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/data.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_brush.o: $(srcdir)/src/msw/brush.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_data.o: $(srcdir)/src/msw/data.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/data.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_caret.o: $(srcdir)/src/msw/caret.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_data.o: $(srcdir)/src/x11/data.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/data.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_caret.o: $(srcdir)/src/msw/caret.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_data.o: $(srcdir)/src/mgl/data.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/data.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_data.o: $(srcdir)/src/motif/data.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/data.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_data.o: $(srcdir)/src/cocoa/data.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/data.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_colour.o: $(srcdir)/src/msw/colour.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_data.o: $(srcdir)/src/os2/data.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/data.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_colour.o: $(srcdir)/src/msw/colour.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_palette.o: $(srcdir)/src/x11/palette.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_cursor.o: $(srcdir)/src/msw/cursor.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_palette.o: $(srcdir)/src/x11/palette.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_cursor.o: $(srcdir)/src/msw/cursor.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_palette.o: $(srcdir)/src/msw/palette.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_data.o: $(srcdir)/src/msw/data.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/data.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_palette.o: $(srcdir)/src/msw/palette.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_data.o: $(srcdir)/src/msw/data.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/data.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_palette.o: $(srcdir)/src/osx/palette.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_dc.o: $(srcdir)/src/msw/dc.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_palette.o: $(srcdir)/src/osx/palette.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_dc.o: $(srcdir)/src/msw/dc.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_palette.o: $(srcdir)/src/mgl/palette.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/palette.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_palette.o: $(srcdir)/src/os2/palette.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/palette.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dcprint.o: $(srcdir)/src/os2/dcprint.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dcprint.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_dialup.o: $(srcdir)/src/msw/dialup.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_dialup.o: $(srcdir)/src/msw/dialup.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@monolib_dib.o: $(srcdir)/src/msw/dib.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@monolib_dib.o: $(srcdir)/src/msw/dib.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
@@ -20526,65 +23630,83 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_dib.o: $(srcdir)/src/msw/dib.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_dib.o: $(srcdir)/src/msw/dib.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_display.o: $(srcdir)/src/msw/display.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_display.o: $(srcdir)/src/msw/display.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/display.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/display.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_display.o: $(srcdir)/src/msw/display.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_display.o: $(srcdir)/src/msw/display.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/display.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/display.cpp
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_display.o: $(srcdir)/src/osx/core/display.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_display.o: $(srcdir)/src/osx/core/display.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_display.o: $(srcdir)/src/cocoa/display.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/display.mm
-
  @COND_TOOLKIT_MSW_USE_GUI_1@monolib_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@monolib_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_font.o: $(srcdir)/src/msw/font.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/font.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_font.o: $(srcdir)/src/msw/font.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/font.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/gdiimage.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
-
  @COND_TOOLKIT_MSW_USE_GUI_1@monolib_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@monolib_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_graphics.o: $(srcdir)/src/msw/graphics.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_graphics.o: $(srcdir)/src/msw/graphics.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_graphics.o: $(srcdir)/src/msw/graphics.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_graphics.o: $(srcdir)/src/msw/graphics.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_icon.o: $(srcdir)/src/msw/icon.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_icon.o: $(srcdir)/src/msw/icon.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_minifram.o: $(srcdir)/src/msw/minifram.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_minifram.o: $(srcdir)/src/msw/minifram.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_ole_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_ole_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@monolib_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/dropsrc.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@monolib_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/dropsrc.cpp
@@ -20604,17 +23726,29 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_palette.o: $(srcdir)/src/msw/palette.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_palette.o: $(srcdir)/src/msw/palette.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_pen.o: $(srcdir)/src/msw/pen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_pen.o: $(srcdir)/src/msw/pen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_printdlg.o: $(srcdir)/src/osx/carbon/printdlg.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/printdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_printdlg.o: $(srcdir)/src/osx/carbon/printdlg.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/printdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@monolib_printwin.o: $(srcdir)/src/msw/printwin.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/printwin.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@monolib_printwin.o: $(srcdir)/src/msw/printwin.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/printwin.cpp
@@ -20622,314 +23756,488 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_printwin.o: $(srcdir)/src/msw/printwin.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/printwin.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_printwin.o: $(srcdir)/src/msw/printwin.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/printwin.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_region.o: $(srcdir)/src/msw/region.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/region.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_region.o: $(srcdir)/src/msw/region.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/region.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_renderer.o: $(srcdir)/src/msw/renderer.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_renderer.o: $(srcdir)/src/msw/renderer.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_settings.o: $(srcdir)/src/msw/settings.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_settings.o: $(srcdir)/src/msw/settings.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_uiaction.o: $(srcdir)/src/msw/uiaction.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/uiaction.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_uiaction.o: $(srcdir)/src/msw/uiaction.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/uiaction.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/utilsgui.cpp
-
  @COND_TOOLKIT_MSW_USE_GUI_1@monolib_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@monolib_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
  
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_window.o: $(srcdir)/src/msw/window.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/window.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_window.o: $(srcdir)/src/msw/window.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/window.cpp
+
  @COND_TOOLKIT_MSW_USE_GUI_1@monolib_helpchm.o: $(srcdir)/src/msw/helpchm.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/helpchm.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@monolib_helpchm.o: $(srcdir)/src/msw/helpchm.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/helpchm.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_helpwin.o: $(srcdir)/src/msw/helpwin.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_helpwin.o: $(srcdir)/src/msw/helpwin.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/helpwin.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/helpwin.cpp
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/helpwin.cpp
-
  @COND_TOOLKIT_MSW_USE_GUI_1@monolib_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/automtn.cpp
  
  @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) $(srcdir)/src/msw/ole/uuid.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@monolib_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/automtn.cpp
  
  @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) $(srcdir)/src/msw/ole/uuid.cpp
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_accel.o: $(srcdir)/src/osx/accel.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_accel.o: $(srcdir)/src/osx/accel.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monolib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_osx_brush.o: $(srcdir)/src/osx/brush.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_osx_brush.o: $(srcdir)/src/osx/brush.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monolib_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monolib_osx_brush.o: $(srcdir)/src/osx/brush.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/motif/accel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/msw/accel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/msw/accel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monolib_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_accel.o: $(srcdir)/src/os2/accel.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_osx_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_osx_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monolib_osx_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_osx_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_osx_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monolib_osx_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_osx_minifram.o: $(srcdir)/src/osx/minifram.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_osx_minifram.o: $(srcdir)/src/osx/minifram.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monolib_osx_minifram.o: $(srcdir)/src/osx/minifram.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monolib_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_osx_palette.o: $(srcdir)/src/osx/palette.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_osx_palette.o: $(srcdir)/src/osx/palette.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monolib_osx_palette.o: $(srcdir)/src/osx/palette.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_osx_pen.o: $(srcdir)/src/osx/pen.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_osx_pen.o: $(srcdir)/src/osx/pen.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monolib_osx_pen.o: $(srcdir)/src/osx/pen.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monolib_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_uiaction_osx.o: $(srcdir)/src/osx/uiaction_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/uiaction_osx.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_uiaction_osx.o: $(srcdir)/src/osx/uiaction_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/uiaction_osx.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monolib_uiaction_osx.o: $(srcdir)/src/osx/uiaction_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/uiaction_osx.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monolib_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monolib_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_core_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_core_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monolib_core_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_core_colour.o: $(srcdir)/src/osx/core/colour.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_core_colour.o: $(srcdir)/src/osx/core/colour.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monolib_core_colour.o: $(srcdir)/src/osx/core/colour.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_core_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_core_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monolib_core_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_core_display.o: $(srcdir)/src/osx/core/display.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_core_display.o: $(srcdir)/src/osx/core/display.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monolib_core_display.o: $(srcdir)/src/osx/core/display.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_core_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_core_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monolib_core_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monolib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monolib_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_core_timer.o: $(srcdir)/src/osx/core/timer.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_core_timer.o: $(srcdir)/src/osx/core/timer.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monolib_core_timer.o: $(srcdir)/src/osx/core/timer.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@monolib_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_generic_timer.o: $(srcdir)/src/generic/timer.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
+
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_generic_timer.o: $(srcdir)/src/generic/timer.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_app.o: $(srcdir)/src/x11/app.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/app.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_clipbrd.o: $(srcdir)/src/x11/clipbrd.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/clipbrd.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_colour.o: $(srcdir)/src/x11/colour.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/colour.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_cursor.o: $(srcdir)/src/x11/cursor.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/cursor.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_data.o: $(srcdir)/src/x11/data.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/data.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_dataobj.o: $(srcdir)/src/x11/dataobj.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/dataobj.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_dc.o: $(srcdir)/src/x11/dc.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/dc.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_dcclient.o: $(srcdir)/src/x11/dcclient.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/dcclient.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_dcmemory.o: $(srcdir)/src/x11/dcmemory.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/dcmemory.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_dcscreen.o: $(srcdir)/src/x11/dcscreen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/dcscreen.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_evtloop.o: $(srcdir)/src/x11/evtloop.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/evtloop.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_font.o: $(srcdir)/src/x11/font.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/font.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_minifram.o: $(srcdir)/src/x11/minifram.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/minifram.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_nanox.o: $(srcdir)/src/x11/nanox.c $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/x11/nanox.c
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_popupwin.o: $(srcdir)/src/x11/popupwin.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/popupwin.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_reparent.o: $(srcdir)/src/x11/reparent.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/reparent.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_settings.o: $(srcdir)/src/x11/settings.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/settings.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_toplevel.o: $(srcdir)/src/x11/toplevel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/toplevel.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_utils.o: $(srcdir)/src/x11/utils.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/utils.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_x11_window.o: $(srcdir)/src/x11/window.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/window.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_generic_colour.o: $(srcdir)/src/generic/colour.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_generic_colour.o: $(srcdir)/src/generic/colour.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mask.o: $(srcdir)/src/generic/mask.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_mask.o: $(srcdir)/src/generic/mask.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_app.o: $(srcdir)/src/mgl/app.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/app.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/bitmap.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_brush.o: $(srcdir)/src/mgl/brush.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/brush.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_clipbrd.o: $(srcdir)/src/mgl/clipbrd.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/clipbrd.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_tabctrl_osx.o: $(srcdir)/src/osx/tabctrl_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/tabctrl_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_cursor.o: $(srcdir)/src/mgl/cursor.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/cursor.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_tabctrl_osx.o: $(srcdir)/src/osx/tabctrl_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/tabctrl_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_data.o: $(srcdir)/src/mgl/data.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/data.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_dc.o: $(srcdir)/src/mgl/dc.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/dc.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/dcclient.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/dcmemory.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_dcscreen.o: $(srcdir)/src/mgl/dcscreen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/dcscreen.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/dirmgl.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/evtloop.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_font.o: $(srcdir)/src/mgl/font.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/font.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_fontenum.o: $(srcdir)/src/mgl/fontenum.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/fontenum.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_fontmgr.o: $(srcdir)/src/mgl/fontmgr.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/fontmgr.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_fontutil.o: $(srcdir)/src/mgl/fontutil.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/fontutil.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_palette.o: $(srcdir)/src/mgl/palette.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/palette.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_pen.o: $(srcdir)/src/mgl/pen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/pen.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_region.o: $(srcdir)/src/mgl/region.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/region.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_settings.o: $(srcdir)/src/mgl/settings.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/settings.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_toplevel.o: $(srcdir)/src/mgl/toplevel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/toplevel.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_utils.o: $(srcdir)/src/mgl/utils.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/utils.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mgl_window.o: $(srcdir)/src/mgl/window.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/window.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_app.o: $(srcdir)/src/dfb/app.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/app.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_bitmap.o: $(srcdir)/src/dfb/bitmap.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/bitmap.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_brush.o: $(srcdir)/src/dfb/brush.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/brush.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_nanox.o: $(srcdir)/src/x11/nanox.c $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/x11/nanox.c
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_cursor.o: $(srcdir)/src/dfb/cursor.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/cursor.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_reparent.o: $(srcdir)/src/x11/reparent.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/reparent.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_dc.o: $(srcdir)/src/dfb/dc.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/dc.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_dcclient.o: $(srcdir)/src/dfb/dcclient.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/dcclient.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_dcmemory.o: $(srcdir)/src/dfb/dcmemory.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/dcmemory.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_mask.o: $(srcdir)/src/generic/mask.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_dcscreen.o: $(srcdir)/src/dfb/dcscreen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/dcscreen.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_mask.o: $(srcdir)/src/generic/mask.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_evtloop.o: $(srcdir)/src/dfb/evtloop.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/evtloop.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/dirmgl.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_font.o: $(srcdir)/src/dfb/font.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/font.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_fontmgr.o: $(srcdir)/src/mgl/fontmgr.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/fontmgr.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_fontenum.o: $(srcdir)/src/dfb/fontenum.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/fontenum.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_fontmgr.o: $(srcdir)/src/dfb/fontmgr.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_fontmgr.o: $(srcdir)/src/dfb/fontmgr.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/fontmgr.cpp
  
  @COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/fontmgr.cpp
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_nonownedwnd.o: $(srcdir)/src/dfb/nonownedwnd.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_nonownedwnd.o: $(srcdir)/src/dfb/nonownedwnd.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/nonownedwnd.cpp
  
  @COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/nonownedwnd.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_nonownedwnd.o: $(srcdir)/src/osx/carbon/nonownedwnd.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/nonownedwnd.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_overlay.o: $(srcdir)/src/dfb/overlay.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/overlay.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_nonownedwnd.o: $(srcdir)/src/osx/cocoa/nonownedwnd.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/nonownedwnd.mm
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_pen.o: $(srcdir)/src/dfb/pen.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/pen.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@monolib_overlay.o: $(srcdir)/src/dfb/overlay.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/overlay.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_region.o: $(srcdir)/src/dfb/region.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/region.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_settings.o: $(srcdir)/src/dfb/settings.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/settings.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_toplevel.o: $(srcdir)/src/dfb/toplevel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/toplevel.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_utils.o: $(srcdir)/src/dfb/utils.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/utils.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_dfb_window.o: $(srcdir)/src/dfb/window.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/window.cpp
  
  @COND_TOOLKIT_DFB_USE_GUI_1@monolib_wrapdfb.o: $(srcdir)/src/dfb/wrapdfb.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/wrapdfb.cpp
  
  @COND_TOOLKIT_DFB_USE_GUI_1@monolib_wrapdfb.o: $(srcdir)/src/dfb/wrapdfb.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/dfb/wrapdfb.cpp
@@ -20940,36 +24248,48 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_PLATFORM_MACOSX_1_USE_GUI_1@monolib_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(MONOLIB_ODEP)
  @COND_PLATFORM_MACOSX_1_USE_GUI_1@     $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
  
  @COND_PLATFORM_MACOSX_1_USE_GUI_1@monolib_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(MONOLIB_ODEP)
  @COND_PLATFORM_MACOSX_1_USE_GUI_1@     $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_USE_GUI_1_WXUNIV_1@monolib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
-@COND_USE_GUI_1_WXUNIV_1@monolib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@monolib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_fdrepdlg.o: $(srcdir)/src/msw/fdrepdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fdrepdlg.cpp
-
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
@@ -20985,11 +24305,14 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
@@ -21000,36 +24323,33 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
  @COND_USE_GUI_1_WXUNIV_1@monolib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
-@COND_USE_GUI_1_WXUNIV_1@monolib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@monolib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
-
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
@@ -21045,11 +24365,14 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
@@ -21057,57 +24380,36 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
  @COND_USE_GUI_1_WXUNIV_1@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
-@COND_USE_GUI_1_WXUNIV_1@monolib_statusbr.o: $(srcdir)/src/univ/statusbr.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/statusbr.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monolib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
@@ -21120,11 +24422,14 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
@@ -21132,1217 +24437,989 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
  @COND_USE_GUI_1_WXUNIV_1@monolib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monolib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/gtk/bmpbuttn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/bmpbuttn.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/gtk1/bmpbuttn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/bmpbuttn.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/motif/bmpbuttn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/bmpbuttn.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/osx/carbon/bmpbuttn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/bmpbuttn.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/osx/cocoa/bmpbuttn.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/bmpbuttn.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/cocoa/bmpbuttn.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/bmpbuttn.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/bmpbuttn.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monolib_bmpbuttn.o: $(srcdir)/src/univ/bmpbuttn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/bmpbuttn.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_button.o: $(srcdir)/src/gtk/button.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/button.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_button.o: $(srcdir)/src/gtk1/button.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/button.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_button.o: $(srcdir)/src/motif/button.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/button.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_button.o: $(srcdir)/src/msw/button.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/button.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_button.o: $(srcdir)/src/msw/button.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/button.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_button.o: $(srcdir)/src/osx/carbon/button.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/button.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_button.o: $(srcdir)/src/osx/cocoa/button.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/button.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_button.o: $(srcdir)/src/cocoa/button.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/button.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_button.o: $(srcdir)/src/os2/button.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/button.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monolib_button.o: $(srcdir)/src/univ/button.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/button.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_checkbox.o: $(srcdir)/src/gtk/checkbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/checkbox.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_checkbox.o: $(srcdir)/src/gtk1/checkbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/checkbox.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_checkbox.o: $(srcdir)/src/motif/checkbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/checkbox.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_checkbox.o: $(srcdir)/src/osx/carbon/checkbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/checkbox.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_checkbox.o: $(srcdir)/src/osx/cocoa/checkbox.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/checkbox.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_checkbox.o: $(srcdir)/src/cocoa/checkbox.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/checkbox.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_checkbox.o: $(srcdir)/src/os2/checkbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/checkbox.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monolib_checkbox.o: $(srcdir)/src/univ/checkbox.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/checkbox.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/gtk/checklst.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/checklst.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/gtk1/checklst.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/checklst.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/motif/checklst.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/checklst.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/msw/checklst.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/msw/wince/checklst.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/wince/checklst.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/cocoa/checklst.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/checklst.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/os2/checklst.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/checklst.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monolib_checklst.o: $(srcdir)/src/univ/checklst.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/checklst.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/gtk/choice.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/choice.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/gtk1/choice.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/choice.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/motif/choice.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/choice.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/msw/choice.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/msw/choice.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/osx/carbon/choice.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/choice.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/osx/cocoa/choice.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/choice.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/cocoa/choice.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/choice.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_choice.o: $(srcdir)/src/os2/choice.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/choice.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monolib_choice.o: $(srcdir)/src/univ/choice.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/choice.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_colordlg.o: $(srcdir)/src/gtk/colordlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/colordlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_colordlg.o: $(srcdir)/src/osx/carbon/colordlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlg.cpp
+@COND_USE_GUI_1_WXUNIV_1@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_colordlg.o: $(srcdir)/src/cocoa/colordlg.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/colordlg.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_combobox.o: $(srcdir)/src/gtk/combobox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/combobox.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_combobox.o: $(srcdir)/src/gtk1/combobox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/combobox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_combobox.o: $(srcdir)/src/motif/combobox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/combobox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_combobox.o: $(srcdir)/src/msw/combobox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_combobox.o: $(srcdir)/src/msw/combobox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_combobox.o: $(srcdir)/src/cocoa/combobox.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/combobox.mm
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_combobox.o: $(srcdir)/src/os2/combobox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/combobox.cpp
+@COND_USE_GUI_1_WXUNIV_1@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monolib_combobox.o: $(srcdir)/src/univ/combobox.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/combobox.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_control.o: $(srcdir)/src/gtk/control.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/control.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_control.o: $(srcdir)/src/gtk1/control.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_control.o: $(srcdir)/src/motif/control.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_control.o: $(srcdir)/src/msw/control.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_control.o: $(srcdir)/src/msw/control.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/control.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_control.o: $(srcdir)/src/osx/carbon/control.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_control.o: $(srcdir)/src/osx/carbon/control.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
+@COND_USE_GUI_1_WXUNIV_1@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_control.o: $(srcdir)/src/cocoa/control.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/control.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_control.o: $(srcdir)/src/os2/control.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/control.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monolib_control.o: $(srcdir)/src/univ/control.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/control.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/gtk/dialog.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/gtk1/dialog.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/motif/dialog.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/msw/dialog.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/msw/dialog.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
+@COND_USE_GUI_1_WXUNIV_1@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/osx/carbon/dialog.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dialog.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/osx/cocoa/dialog.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/dialog.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/cocoa/dialog.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/dialog.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dialog.o: $(srcdir)/src/os2/dialog.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monolib_dialog.o: $(srcdir)/src/univ/dialog.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_dirdlg.o: $(srcdir)/src/gtk/dirdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dirdlg.cpp
+@COND_USE_GUI_1_WXUNIV_1@monolib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_dirdlg.o: $(srcdir)/src/osx/carbon/dirdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dirdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_dirdlg.o: $(srcdir)/src/osx/cocoa/dirdlg.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/dirdlg.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_dirdlg.o: $(srcdir)/src/cocoa/dirdlg.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/dirdlg.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/gtk/filedlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/filedlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/gtk1/filedlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/filedlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/filedlg.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
+@COND_USE_GUI_1_WXUNIV_1@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/osx/carbon/filedlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/filedlg.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/osx/cocoa/filedlg.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/filedlg.mm
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/cocoa/filedlg.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/filedlg.mm
+@COND_USE_GUI_1_WXUNIV_1@monolib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_filedlg.o: $(srcdir)/src/os2/filedlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/filedlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_fontdlg.o: $(srcdir)/src/gtk/fontdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/fontdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_fontdlg.o: $(srcdir)/src/gtk1/fontdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/fontdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_anybutton.o: $(srcdir)/src/msw/anybutton.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/anybutton.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_fontdlg.o: $(srcdir)/src/msw/fontdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/fontdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_anybutton.o: $(srcdir)/src/msw/anybutton.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/anybutton.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_artmsw.o: $(srcdir)/src/msw/artmsw.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/artmsw.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_artmsw.o: $(srcdir)/src/msw/artmsw.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/artmsw.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontdlg.o: $(srcdir)/src/cocoa/fontdlg.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/fontdlg.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_fontdlg.o: $(srcdir)/src/os2/fontdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/fontdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_frame.o: $(srcdir)/src/gtk/frame.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/frame.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_button.o: $(srcdir)/src/msw/button.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/button.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_frame.o: $(srcdir)/src/gtk1/frame.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/frame.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_button.o: $(srcdir)/src/msw/button.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/button.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_frame.o: $(srcdir)/src/motif/frame.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/frame.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_frame.o: $(srcdir)/src/msw/frame.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_frame.o: $(srcdir)/src/msw/frame.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_choice.o: $(srcdir)/src/msw/choice.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_choice.o: $(srcdir)/src/msw/choice.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_frame.o: $(srcdir)/src/cocoa/frame.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/frame.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_frame.o: $(srcdir)/src/os2/frame.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/frame.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_combo.o: $(srcdir)/src/msw/combo.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/gtk/gauge.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/gauge.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_combo.o: $(srcdir)/src/msw/combo.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/gtk1/gauge.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/gauge.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_combobox.o: $(srcdir)/src/msw/combobox.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/motif/gauge.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_combobox.o: $(srcdir)/src/msw/combobox.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/msw/gauge.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_control.o: $(srcdir)/src/msw/control.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/control.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/msw/gauge.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_control.o: $(srcdir)/src/msw/control.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/control.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/osx/carbon/gauge.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gauge.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_dialog.o: $(srcdir)/src/msw/dialog.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/osx/cocoa/gauge.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/gauge.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_dialog.o: $(srcdir)/src/msw/dialog.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/cocoa/gauge.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/gauge.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_gauge.o: $(srcdir)/src/os2/gauge.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/gauge.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monolib_gauge.o: $(srcdir)/src/univ/gauge.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/gauge.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_print.o: $(srcdir)/src/gtk/print.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/print.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_print.o: $(srcdir)/src/os2/print.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/print.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/gtk/listbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/listbox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/gtk1/listbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/listbox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_frame.o: $(srcdir)/src/msw/frame.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/motif/listbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/listbox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_frame.o: $(srcdir)/src/msw/frame.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/msw/listbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_gauge.o: $(srcdir)/src/msw/gauge.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/msw/listbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_gauge.o: $(srcdir)/src/msw/gauge.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/osx/carbon/listbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/listbox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_headerctrl.o: $(srcdir)/src/msw/headerctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/headerctrl.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/osx/cocoa/listbox.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/listbox.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_headerctrl.o: $(srcdir)/src/msw/headerctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/headerctrl.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/cocoa/listbox.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/listbox.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/os2/listbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/listbox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monolib_listbox.o: $(srcdir)/src/univ/listbox.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/listbox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_listbox.o: $(srcdir)/src/msw/listbox.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_mdi.o: $(srcdir)/src/gtk/mdi.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/mdi.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_listbox.o: $(srcdir)/src/msw/listbox.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_mdi.o: $(srcdir)/src/gtk1/mdi.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/mdi.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_mdi.o: $(srcdir)/src/motif/mdi.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/mdi.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_mdi.o: $(srcdir)/src/msw/mdi.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_mdi.o: $(srcdir)/src/msw/mdi.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_mdi.o: $(srcdir)/src/msw/mdi.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_mdi.o: $(srcdir)/src/msw/mdi.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_mdi.o: $(srcdir)/src/cocoa/mdi.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/mdi.mm
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_menu.o: $(srcdir)/src/gtk/menu.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/menu.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_menu.o: $(srcdir)/src/gtk1/menu.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/menu.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_menu.o: $(srcdir)/src/motif/menu.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/menu.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_menu.o: $(srcdir)/src/msw/menu.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_menu.o: $(srcdir)/src/msw/menu.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_menu.o: $(srcdir)/src/msw/menu.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_menu.o: $(srcdir)/src/msw/menu.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_menu.o: $(srcdir)/src/osx/carbon/menu.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/menu.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_menu.o: $(srcdir)/src/osx/cocoa/menu.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/menu.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_menu.o: $(srcdir)/src/cocoa/menu.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/menu.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_menu.o: $(srcdir)/src/os2/menu.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/menu.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monolib_menu.o: $(srcdir)/src/univ/menu.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/menu.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_msgdlg.o: $(srcdir)/src/gtk/msgdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/msgdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_metafile.o: $(srcdir)/src/msw/metafile.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_msgdlg.o: $(srcdir)/src/motif/msgdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/msgdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_metafile.o: $(srcdir)/src/msw/metafile.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_msgdlg.o: $(srcdir)/src/osx/carbon/msgdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/msgdlg.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_msgdlg.o: $(srcdir)/src/osx/cocoa/msgdlg.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/msgdlg.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_msgdlg.o: $(srcdir)/src/cocoa/msgdlg.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/msgdlg.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_msgdlg.o: $(srcdir)/src/os2/msgdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/msgdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_nativewin.o: $(srcdir)/src/gtk/nativewin.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/nativewin.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_notebook.o: $(srcdir)/src/gtk/notebook.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/notebook.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_notebook.o: $(srcdir)/src/gtk1/notebook.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/notebook.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_notebook.o: $(srcdir)/src/generic/notebook.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/notebook.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_notebook.o: $(srcdir)/src/msw/notebook.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_notebook.o: $(srcdir)/src/msw/notebook.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_notebook.o: $(srcdir)/src/msw/notebook.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_notebook.o: $(srcdir)/src/msw/notebook.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_notebook.o: $(srcdir)/src/osx/cocoa/notebook.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/notebook.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_access.o: $(srcdir)/src/msw/ole/access.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_access.o: $(srcdir)/src/msw/ole/access.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_notebook.o: $(srcdir)/src/cocoa/notebook.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/notebook.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_notebook.o: $(srcdir)/src/os2/notebook.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/notebook.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monolib_notebook.o: $(srcdir)/src/univ/notebook.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/notebook.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_panel.o: $(srcdir)/src/msw/panel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/panel.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_radiobox.o: $(srcdir)/src/gtk/radiobox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/radiobox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_panel.o: $(srcdir)/src/msw/panel.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/panel.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_radiobox.o: $(srcdir)/src/gtk1/radiobox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/radiobox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_progdlg.o: $(srcdir)/src/msw/progdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/progdlg.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_radiobox.o: $(srcdir)/src/motif/radiobox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/radiobox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_progdlg.o: $(srcdir)/src/msw/progdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/progdlg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_radiobox.o: $(srcdir)/src/cocoa/radiobox.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/radiobox.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_radiobox.o: $(srcdir)/src/os2/radiobox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/radiobox.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monolib_radiobox.o: $(srcdir)/src/univ/radiobox.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/radiobox.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_radiobut.o: $(srcdir)/src/gtk/radiobut.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/radiobut.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_radiobut.o: $(srcdir)/src/gtk1/radiobut.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/radiobut.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_radiobut.o: $(srcdir)/src/motif/radiobut.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/radiobut.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_radiobut.o: $(srcdir)/src/osx/carbon/radiobut.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/radiobut.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_radiobut.o: $(srcdir)/src/osx/cocoa/radiobut.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/radiobut.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_radiobut.o: $(srcdir)/src/cocoa/radiobut.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/radiobut.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_radiobut.o: $(srcdir)/src/os2/radiobut.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/radiobut.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_richmsgdlg.o: $(srcdir)/src/msw/richmsgdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/richmsgdlg.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monolib_radiobut.o: $(srcdir)/src/univ/radiobut.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/radiobut.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_richmsgdlg.o: $(srcdir)/src/msw/richmsgdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/richmsgdlg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_scrolbar.o: $(srcdir)/src/gtk/scrolbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/scrolbar.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_scrolbar.o: $(srcdir)/src/gtk1/scrolbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/scrolbar.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/scrolbar.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_scrolbar.o: $(srcdir)/src/osx/carbon/scrolbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/scrolbar.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_scrolbar.o: $(srcdir)/src/osx/cocoa/scrolbar.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/scrolbar.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_scrolbar.o: $(srcdir)/src/cocoa/scrolbar.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/scrolbar.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/scrolbar.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@monolib_scrolbar.o: $(srcdir)/src/univ/scrolbar.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/scrolbar.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_scrolwin.o: $(srcdir)/src/gtk/scrolwin.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/scrolwin.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_slider.o: $(srcdir)/src/msw/slider.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_scrolwin.o: $(srcdir)/src/gtk1/scrolwin.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/scrolwin.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_slider.o: $(srcdir)/src/msw/slider.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/gtk/slider.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/slider.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/gtk1/slider.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/slider.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/motif/slider.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/slider.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/msw/slider.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/msw/slider.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/osx/carbon/slider.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/slider.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/osx/cocoa/slider.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/slider.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_statbox.o: $(srcdir)/src/msw/statbox.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/cocoa/slider.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/slider.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_statbox.o: $(srcdir)/src/msw/statbox.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_slider.o: $(srcdir)/src/os2/slider.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/slider.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monolib_slider.o: $(srcdir)/src/univ/slider.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/slider.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_spinbutt.o: $(srcdir)/src/gtk/spinbutt.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/spinbutt.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_statline.o: $(srcdir)/src/msw/statline.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_spinbutt.o: $(srcdir)/src/gtk1/spinbutt.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/spinbutt.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_statline.o: $(srcdir)/src/msw/statline.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_spinbutt.o: $(srcdir)/src/motif/spinbutt.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/spinbutt.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_stattext.o: $(srcdir)/src/msw/stattext.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_stattext.o: $(srcdir)/src/msw/stattext.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_spinbutt.o: $(srcdir)/src/osx/carbon/spinbutt.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/spinbutt.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_spinbutt.o: $(srcdir)/src/osx/cocoa/spinbutt.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/spinbutt.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_spinbutt.o: $(srcdir)/src/cocoa/spinbutt.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/spinbutt.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_spinbutt.o: $(srcdir)/src/os2/spinbutt.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/spinbutt.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_textentry.o: $(srcdir)/src/msw/textentry.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monolib_spinbutt.o: $(srcdir)/src/univ/spinbutt.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/spinbutt.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_textentry.o: $(srcdir)/src/msw/textentry.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_spinctrl.o: $(srcdir)/src/gtk/spinctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/spinctrl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_spinctrl.o: $(srcdir)/src/gtk1/spinctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/spinctrl.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
+@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) $(srcdir)/src/msw/treectrl.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/spinctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_anybutton_osx.o: $(srcdir)/src/osx/anybutton_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/anybutton_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_statbmp.o: $(srcdir)/src/gtk/statbmp.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_anybutton_osx.o: $(srcdir)/src/osx/anybutton_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/anybutton_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_statbmp.o: $(srcdir)/src/gtk1/statbmp.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_anybutton_osx.o: $(srcdir)/src/osx/anybutton_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/anybutton_osx.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_statbmp.o: $(srcdir)/src/motif/statbmp.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_statbmp.o: $(srcdir)/src/osx/carbon/statbmp.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_statbmp.o: $(srcdir)/src/cocoa/statbmp.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/statbmp.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_statbmp.o: $(srcdir)/src/os2/statbmp.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monolib_statbmp.o: $(srcdir)/src/univ/statbmp.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_statbox.o: $(srcdir)/src/gtk/statbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_statbox.o: $(srcdir)/src/gtk1/statbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_statbox.o: $(srcdir)/src/motif/statbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_statbox.o: $(srcdir)/src/msw/statbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_statbox.o: $(srcdir)/src/msw/statbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_statbox.o: $(srcdir)/src/osx/carbon/statbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_statbox.o: $(srcdir)/src/osx/cocoa/statbox.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/statbox.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_statbox.o: $(srcdir)/src/cocoa/statbox.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/statbox.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_statbox.o: $(srcdir)/src/os2/statbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_combobox_osx.o: $(srcdir)/src/osx/combobox_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/combobox_osx.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monolib_statbox.o: $(srcdir)/src/univ/statbox.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_combobox_osx.o: $(srcdir)/src/osx/combobox_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/combobox_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_statline.o: $(srcdir)/src/gtk/statline.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/statline.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_combobox_osx.o: $(srcdir)/src/osx/combobox_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/combobox_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_statline.o: $(srcdir)/src/gtk1/statline.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/statline.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_dnd_osx.o: $(srcdir)/src/osx/dnd_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/dnd_osx.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_statline.o: $(srcdir)/src/generic/statline.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statline.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_dnd_osx.o: $(srcdir)/src/osx/dnd_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/dnd_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_statline.o: $(srcdir)/src/msw/statline.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_dnd_osx.o: $(srcdir)/src/osx/dnd_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/dnd_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_statline.o: $(srcdir)/src/msw/statline.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_statline.o: $(srcdir)/src/osx/cocoa/statline.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/statline.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_statline.o: $(srcdir)/src/os2/statline.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/statline.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monolib_statline.o: $(srcdir)/src/univ/statline.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/statline.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/motif/stattext.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/msw/stattext.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/msw/stattext.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/osx/carbon/stattext.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/osx/cocoa/stattext.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/stattext.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/cocoa/stattext.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/stattext.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_stattext.o: $(srcdir)/src/os2/stattext.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monolib_stattext.o: $(srcdir)/src/univ/stattext.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/tbargtk.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_tbargtk.o: $(srcdir)/src/gtk1/tbargtk.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/tbargtk.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_printdlg_osx.o: $(srcdir)/src/osx/printdlg_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/printdlg_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/textctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_printdlg_osx.o: $(srcdir)/src/osx/printdlg_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/printdlg_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_printdlg_osx.o: $(srcdir)/src/osx/printdlg_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/printdlg_osx.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/motif/textctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/textctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/osx/carbon/textctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/textctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/osx/cocoa/textctrl.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/textctrl.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/cocoa/textctrl.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/textctrl.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_textctrl.o: $(srcdir)/src/os2/textctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/textctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monolib_textctrl.o: $(srcdir)/src/univ/textctrl.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/textctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_textentry.o: $(srcdir)/src/gtk/textentry.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/textentry.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_textentry.o: $(srcdir)/src/motif/textentry.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/textentry.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_textentry.o: $(srcdir)/src/msw/textentry.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_textentry.o: $(srcdir)/src/msw/textentry.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_textentry.o: $(srcdir)/src/os2/textentry.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/textentry.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_tglbtn.o: $(srcdir)/src/gtk/tglbtn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/tglbtn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_tglbtn.o: $(srcdir)/src/gtk1/tglbtn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/tglbtn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_tglbtn.o: $(srcdir)/src/osx/carbon/tglbtn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tglbtn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_tglbtn.o: $(srcdir)/src/osx/cocoa/tglbtn.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/tglbtn.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_tglbtn.o: $(srcdir)/src/os2/tglbtn.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/tglbtn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monolib_tglbtn.o: $(srcdir)/src/univ/tglbtn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/tglbtn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_textentry_osx.o: $(srcdir)/src/osx/textentry_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/textentry_osx.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_textentry_osx.o: $(srcdir)/src/osx/textentry_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/textentry_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_textentry_osx.o: $(srcdir)/src/osx/textentry_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/textentry_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm
  
  
-@COND_USE_GUI_1_WXUNIV_1@monolib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
  
  
-@COND_USE_GUI_1_WXUNIV_1@monolib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
  
  
-@COND_USE_GUI_1_WXUNIV_1@monolib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_osx_accel.o: $(srcdir)/src/osx/accel.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_osx_accel.o: $(srcdir)/src/osx/accel.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_osx_accel.o: $(srcdir)/src/osx/accel.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monolib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/menuitem.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_menuitem.o: $(srcdir)/src/osx/carbon/menuitem.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/menuitem.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_menuitem.o: $(srcdir)/src/osx/cocoa/menuitem.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/menuitem.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_menuitem.o: $(srcdir)/src/cocoa/menuitem.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/menuitem.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_menuitem.o: $(srcdir)/src/os2/menuitem.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/menuitem.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_toolbar.o: $(srcdir)/src/motif/toolbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/toolbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_app.o: $(srcdir)/src/osx/carbon/app.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_app.o: $(srcdir)/src/osx/carbon/app.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_toolbar.o: $(srcdir)/src/osx/carbon/toolbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/toolbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_app.o: $(srcdir)/src/osx/carbon/app.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_toolbar.o: $(srcdir)/src/osx/cocoa/toolbar.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/toolbar.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_toolbar.o: $(srcdir)/src/cocoa/toolbar.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/toolbar.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_toolbar.o: $(srcdir)/src/os2/toolbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/toolbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monolib_toolbar.o: $(srcdir)/src/univ/toolbar.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/toolbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_control.o: $(srcdir)/src/osx/carbon/control.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_combo.o: $(srcdir)/src/msw/combo.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_control.o: $(srcdir)/src/osx/carbon/control.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_combo.o: $(srcdir)/src/msw/combo.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_control.o: $(srcdir)/src/osx/carbon/control.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_iniconf.o: $(srcdir)/src/os2/iniconf.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/iniconf.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_metafile.o: $(srcdir)/src/msw/metafile.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_metafile.o: $(srcdir)/src/msw/metafile.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_metafile.o: $(srcdir)/src/os2/metafile.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/metafile.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_nativdlg.o: $(srcdir)/src/os2/nativdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/nativdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_glgrab.o: $(srcdir)/src/osx/core/glgrab.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/glgrab.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_access.o: $(srcdir)/src/msw/ole/access.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_glgrab.o: $(srcdir)/src/osx/core/glgrab.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/glgrab.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_access.o: $(srcdir)/src/msw/ole/access.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_glgrab.o: $(srcdir)/src/osx/core/glgrab.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/glgrab.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/ownerdrw.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_font.o: $(srcdir)/src/osx/carbon/font.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_font.o: $(srcdir)/src/osx/carbon/font.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_font.o: $(srcdir)/src/osx/carbon/font.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_tabctrl.o: $(srcdir)/src/osx/carbon/tabctrl.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tabctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_tabctrl.o: $(srcdir)/src/osx/carbon/tabctrl.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tabctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_tabctrl.o: $(srcdir)/src/os2/tabctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/tabctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
  
  
-@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) $(srcdir)/src/msw/treectrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_srchctrl.o: $(srcdir)/src/osx/carbon/srchctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/srchctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_srchctrl.o: $(srcdir)/src/osx/cocoa/srchctrl.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/srchctrl.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_regiong.o: $(srcdir)/src/generic/regiong.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_regiong.o: $(srcdir)/src/generic/regiong.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
  
  
-@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) $(srcdir)/src/cocoa/drawer.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_drawer.o: $(srcdir)/src/osx/carbon/drawer.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/drawer.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_sound.o: $(srcdir)/src/cocoa/sound.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/sound.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_sound.o: $(srcdir)/src/msw/sound.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/sound.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_sound.o: $(srcdir)/src/msw/sound.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/sound.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_sound.o: $(srcdir)/src/osx/carbon/sound.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/sound.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_carbon_region.o: $(srcdir)/src/osx/carbon/region.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/region.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_region.o: $(srcdir)/src/osx/carbon/region.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/region.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_region.o: $(srcdir)/src/osx/carbon/region.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/region.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monolib_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
  
  
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monolib_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
  
  
-@COND_TOOLKIT_PM_USE_GUI_1@monolib_sound.o: $(srcdir)/src/os2/sound.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/sound.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
+@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_regiong.o: $(srcdir)/src/generic/regiong.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@monolib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_regiong.o: $(srcdir)/src/generic/regiong.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
  
  @COND_USE_GUI_1@monolib_accelcmn.o: $(srcdir)/src/common/accelcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/accelcmn.cpp
  
  @COND_USE_GUI_1@monolib_accelcmn.o: $(srcdir)/src/common/accelcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/accelcmn.cpp
@@ -22353,6 +25430,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@monolib_anidecod.o: $(srcdir)/src/common/anidecod.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/anidecod.cpp
  
  @COND_USE_GUI_1@monolib_anidecod.o: $(srcdir)/src/common/anidecod.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/anidecod.cpp
  
+@COND_USE_GUI_1@monolib_affinematrix2d.o: $(srcdir)/src/common/affinematrix2d.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/affinematrix2d.cpp
+
  @COND_USE_GUI_1@monolib_appcmn.o: $(srcdir)/src/common/appcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/appcmn.cpp
  
  @COND_USE_GUI_1@monolib_appcmn.o: $(srcdir)/src/common/appcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/appcmn.cpp
  
@@ -22362,9 +25442,15 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@monolib_artstd.o: $(srcdir)/src/common/artstd.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/artstd.cpp
  
  @COND_USE_GUI_1@monolib_artstd.o: $(srcdir)/src/common/artstd.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/artstd.cpp
  
+@COND_USE_GUI_1@monolib_arttango.o: $(srcdir)/src/common/arttango.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/arttango.cpp
+
  @COND_USE_GUI_1@monolib_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/bmpbase.cpp
  
  @COND_USE_GUI_1@monolib_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/bmpbase.cpp
  
+@COND_USE_GUI_1@monolib_bmpbtncmn.o: $(srcdir)/src/common/bmpbtncmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/bmpbtncmn.cpp
+
  @COND_USE_GUI_1@monolib_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/bookctrl.cpp
  
  @COND_USE_GUI_1@monolib_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/bookctrl.cpp
  
@@ -22374,6 +25460,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@monolib_cairo.o: $(srcdir)/src/common/cairo.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/cairo.cpp
  
  @COND_USE_GUI_1@monolib_cairo.o: $(srcdir)/src/common/cairo.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/cairo.cpp
  
+@COND_USE_GUI_1@monolib_checkboxcmn.o: $(srcdir)/src/common/checkboxcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/checkboxcmn.cpp
+
+@COND_USE_GUI_1@monolib_checklstcmn.o: $(srcdir)/src/common/checklstcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/checklstcmn.cpp
+
  @COND_USE_GUI_1@monolib_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/choiccmn.cpp
  
  @COND_USE_GUI_1@monolib_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/choiccmn.cpp
  
@@ -22386,6 +25478,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@monolib_colourcmn.o: $(srcdir)/src/common/colourcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/colourcmn.cpp
  
  @COND_USE_GUI_1@monolib_colourcmn.o: $(srcdir)/src/common/colourcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/colourcmn.cpp
  
+@COND_USE_GUI_1@monolib_colourdata.o: $(srcdir)/src/common/colourdata.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/colourdata.cpp
+
  @COND_USE_GUI_1@monolib_combocmn.o: $(srcdir)/src/common/combocmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/combocmn.cpp
  
  @COND_USE_GUI_1@monolib_combocmn.o: $(srcdir)/src/common/combocmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/combocmn.cpp
  
@@ -22407,9 +25502,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@monolib_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/ctrlsub.cpp
  
  @COND_USE_GUI_1@monolib_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/ctrlsub.cpp
  
-@COND_USE_GUI_1@monolib_datacmn.o: $(srcdir)/src/common/datacmn.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/datacmn.cpp
-
  @COND_USE_GUI_1@monolib_dcbase.o: $(srcdir)/src/common/dcbase.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dcbase.cpp
  
  @COND_USE_GUI_1@monolib_dcbase.o: $(srcdir)/src/common/dcbase.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dcbase.cpp
  
@@ -22422,6 +25514,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@monolib_dcsvg.o: $(srcdir)/src/common/dcsvg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dcsvg.cpp
  
  @COND_USE_GUI_1@monolib_dcsvg.o: $(srcdir)/src/common/dcsvg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dcsvg.cpp
  
+@COND_USE_GUI_1@monolib_dirctrlcmn.o: $(srcdir)/src/common/dirctrlcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dirctrlcmn.cpp
+
  @COND_USE_GUI_1@monolib_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp
  
  @COND_USE_GUI_1@monolib_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp
  
@@ -22452,6 +25547,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@monolib_filectrlcmn.o: $(srcdir)/src/common/filectrlcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/filectrlcmn.cpp
  
  @COND_USE_GUI_1@monolib_filectrlcmn.o: $(srcdir)/src/common/filectrlcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/filectrlcmn.cpp
  
+@COND_USE_GUI_1@monolib_filehistorycmn.o: $(srcdir)/src/common/filehistorycmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/filehistorycmn.cpp
+
  @COND_USE_GUI_1@monolib_filepickercmn.o: $(srcdir)/src/common/filepickercmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/filepickercmn.cpp
  
  @COND_USE_GUI_1@monolib_filepickercmn.o: $(srcdir)/src/common/filepickercmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/filepickercmn.cpp
  
@@ -22464,6 +25562,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@monolib_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontcmn.cpp
  
  @COND_USE_GUI_1@monolib_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontcmn.cpp
  
+@COND_USE_GUI_1@monolib_fontdata.o: $(srcdir)/src/common/fontdata.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontdata.cpp
+
+@COND_USE_GUI_1@monolib_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp
+
  @COND_USE_GUI_1@monolib_fontenumcmn.o: $(srcdir)/src/common/fontenumcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontenumcmn.cpp
  
  @COND_USE_GUI_1@monolib_fontenumcmn.o: $(srcdir)/src/common/fontenumcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontenumcmn.cpp
  
@@ -22494,6 +25598,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@monolib_graphcmn.o: $(srcdir)/src/common/graphcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/graphcmn.cpp
  
  @COND_USE_GUI_1@monolib_graphcmn.o: $(srcdir)/src/common/graphcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/graphcmn.cpp
  
+@COND_USE_GUI_1@monolib_headercolcmn.o: $(srcdir)/src/common/headercolcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/headercolcmn.cpp
+
+@COND_USE_GUI_1@monolib_headerctrlcmn.o: $(srcdir)/src/common/headerctrlcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/headerctrlcmn.cpp
+
  @COND_USE_GUI_1@monolib_helpbase.o: $(srcdir)/src/common/helpbase.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/helpbase.cpp
  
  @COND_USE_GUI_1@monolib_helpbase.o: $(srcdir)/src/common/helpbase.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/helpbase.cpp
  
@@ -22548,21 +25658,36 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@monolib_listctrlcmn.o: $(srcdir)/src/common/listctrlcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/listctrlcmn.cpp
  
  @COND_USE_GUI_1@monolib_listctrlcmn.o: $(srcdir)/src/common/listctrlcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/listctrlcmn.cpp
  
+@COND_USE_GUI_1@monolib_markupparser.o: $(srcdir)/src/common/markupparser.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/markupparser.cpp
+
  @COND_USE_GUI_1@monolib_matrix.o: $(srcdir)/src/common/matrix.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/matrix.cpp
  
  @COND_USE_GUI_1@monolib_menucmn.o: $(srcdir)/src/common/menucmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/menucmn.cpp
  
  @COND_USE_GUI_1@monolib_matrix.o: $(srcdir)/src/common/matrix.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/matrix.cpp
  
  @COND_USE_GUI_1@monolib_menucmn.o: $(srcdir)/src/common/menucmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/menucmn.cpp
  
+@COND_USE_GUI_1@monolib_mousemanager.o: $(srcdir)/src/common/mousemanager.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/mousemanager.cpp
+
  @COND_USE_GUI_1@monolib_nbkbase.o: $(srcdir)/src/common/nbkbase.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/nbkbase.cpp
  
  @COND_USE_GUI_1@monolib_overlaycmn.o: $(srcdir)/src/common/overlaycmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/overlaycmn.cpp
  
  @COND_USE_GUI_1@monolib_nbkbase.o: $(srcdir)/src/common/nbkbase.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/nbkbase.cpp
  
  @COND_USE_GUI_1@monolib_overlaycmn.o: $(srcdir)/src/common/overlaycmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/overlaycmn.cpp
  
+@COND_USE_GUI_1@monolib_ownerdrwcmn.o: $(srcdir)/src/common/ownerdrwcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/ownerdrwcmn.cpp
+
  @COND_USE_GUI_1@monolib_paper.o: $(srcdir)/src/common/paper.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/paper.cpp
  
  @COND_USE_GUI_1@monolib_paper.o: $(srcdir)/src/common/paper.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/paper.cpp
  
+@COND_USE_GUI_1@monolib_panelcmn.o: $(srcdir)/src/common/panelcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/panelcmn.cpp
+
+@COND_USE_GUI_1@monolib_persist.o: $(srcdir)/src/common/persist.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/persist.cpp
+
  @COND_USE_GUI_1@monolib_pickerbase.o: $(srcdir)/src/common/pickerbase.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/pickerbase.cpp
  
  @COND_USE_GUI_1@monolib_pickerbase.o: $(srcdir)/src/common/pickerbase.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/pickerbase.cpp
  
@@ -22575,27 +25700,54 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@monolib_quantize.o: $(srcdir)/src/common/quantize.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/quantize.cpp
  
  @COND_USE_GUI_1@monolib_quantize.o: $(srcdir)/src/common/quantize.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/quantize.cpp
  
+@COND_USE_GUI_1@monolib_radiobtncmn.o: $(srcdir)/src/common/radiobtncmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/radiobtncmn.cpp
+
  @COND_USE_GUI_1@monolib_radiocmn.o: $(srcdir)/src/common/radiocmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/radiocmn.cpp
  
  @COND_USE_GUI_1@monolib_radiocmn.o: $(srcdir)/src/common/radiocmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/radiocmn.cpp
  
+@COND_USE_GUI_1@monolib_rearrangectrl.o: $(srcdir)/src/common/rearrangectrl.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/rearrangectrl.cpp
+
  @COND_USE_GUI_1@monolib_rendcmn.o: $(srcdir)/src/common/rendcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/rendcmn.cpp
  
  @COND_USE_GUI_1@monolib_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/rgncmn.cpp
  
  @COND_USE_GUI_1@monolib_rendcmn.o: $(srcdir)/src/common/rendcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/rendcmn.cpp
  
  @COND_USE_GUI_1@monolib_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/rgncmn.cpp
  
+@COND_USE_GUI_1@monolib_scrolbarcmn.o: $(srcdir)/src/common/scrolbarcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/scrolbarcmn.cpp
+
  @COND_USE_GUI_1@monolib_settcmn.o: $(srcdir)/src/common/settcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/settcmn.cpp
  
  @COND_USE_GUI_1@monolib_sizer.o: $(srcdir)/src/common/sizer.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
  
  @COND_USE_GUI_1@monolib_settcmn.o: $(srcdir)/src/common/settcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/settcmn.cpp
  
  @COND_USE_GUI_1@monolib_sizer.o: $(srcdir)/src/common/sizer.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
  
+@COND_USE_GUI_1@monolib_slidercmn.o: $(srcdir)/src/common/slidercmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/slidercmn.cpp
+
+@COND_USE_GUI_1@monolib_spinbtncmn.o: $(srcdir)/src/common/spinbtncmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/spinbtncmn.cpp
+
+@COND_USE_GUI_1@monolib_spinctrlcmn.o: $(srcdir)/src/common/spinctrlcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/spinctrlcmn.cpp
+
  @COND_USE_GUI_1@monolib_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp
  
  @COND_USE_GUI_1@monolib_statbar.o: $(srcdir)/src/common/statbar.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/statbar.cpp
  
  @COND_USE_GUI_1@monolib_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp
  
  @COND_USE_GUI_1@monolib_statbar.o: $(srcdir)/src/common/statbar.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/statbar.cpp
  
+@COND_USE_GUI_1@monolib_statbmpcmn.o: $(srcdir)/src/common/statbmpcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/statbmpcmn.cpp
+
+@COND_USE_GUI_1@monolib_statboxcmn.o: $(srcdir)/src/common/statboxcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/statboxcmn.cpp
+
+@COND_USE_GUI_1@monolib_statlinecmn.o: $(srcdir)/src/common/statlinecmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/statlinecmn.cpp
+
  @COND_USE_GUI_1@monolib_stattextcmn.o: $(srcdir)/src/common/stattextcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/stattextcmn.cpp
  
  @COND_USE_GUI_1@monolib_stattextcmn.o: $(srcdir)/src/common/stattextcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/stattextcmn.cpp
  
@@ -22617,6 +25769,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@monolib_treebase.o: $(srcdir)/src/common/treebase.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/treebase.cpp
  
  @COND_USE_GUI_1@monolib_treebase.o: $(srcdir)/src/common/treebase.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/treebase.cpp
  
+@COND_USE_GUI_1@monolib_uiactioncmn.o: $(srcdir)/src/common/uiactioncmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/uiactioncmn.cpp
+
  @COND_USE_GUI_1@monolib_valgen.o: $(srcdir)/src/common/valgen.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/valgen.cpp
  
  @COND_USE_GUI_1@monolib_valgen.o: $(srcdir)/src/common/valgen.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/valgen.cpp
  
@@ -22626,6 +25781,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@monolib_valtext.o: $(srcdir)/src/common/valtext.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/valtext.cpp
  
  @COND_USE_GUI_1@monolib_valtext.o: $(srcdir)/src/common/valtext.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/valtext.cpp
  
+@COND_USE_GUI_1@monolib_valnum.o: $(srcdir)/src/common/valnum.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/valnum.cpp
+
  @COND_USE_GUI_1@monolib_wincmn.o: $(srcdir)/src/common/wincmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/wincmn.cpp
  
  @COND_USE_GUI_1@monolib_wincmn.o: $(srcdir)/src/common/wincmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/wincmn.cpp
  
@@ -22641,7 +25799,7 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@monolib_busyinfo.o: $(srcdir)/src/generic/busyinfo.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/busyinfo.cpp
  
  @COND_USE_GUI_1@monolib_busyinfo.o: $(srcdir)/src/generic/busyinfo.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/busyinfo.cpp
  
-@COND_USE_GUI_1@monolib_buttonbar.o: $(srcdir)/src/generic/buttonbar.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@monolib_generic_buttonbar.o: $(srcdir)/src/generic/buttonbar.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/buttonbar.cpp
  
  @COND_USE_GUI_1@monolib_choicdgg.o: $(srcdir)/src/generic/choicdgg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/buttonbar.cpp
  
  @COND_USE_GUI_1@monolib_choicdgg.o: $(srcdir)/src/generic/choicdgg.cpp $(MONOLIB_ODEP)
@@ -22665,12 +25823,24 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@monolib_filectrlg.o: $(srcdir)/src/generic/filectrlg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filectrlg.cpp
  
  @COND_USE_GUI_1@monolib_filectrlg.o: $(srcdir)/src/generic/filectrlg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/filectrlg.cpp
  
+@COND_USE_GUI_1@monolib_headerctrlg.o: $(srcdir)/src/generic/headerctrlg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/headerctrlg.cpp
+
+@COND_USE_GUI_1@monolib_generic_infobar.o: $(srcdir)/src/generic/infobar.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/infobar.cpp
+
  @COND_USE_GUI_1@monolib_listbkg.o: $(srcdir)/src/generic/listbkg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listbkg.cpp
  
  @COND_USE_GUI_1@monolib_logg.o: $(srcdir)/src/generic/logg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/logg.cpp
  
  @COND_USE_GUI_1@monolib_listbkg.o: $(srcdir)/src/generic/listbkg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listbkg.cpp
  
  @COND_USE_GUI_1@monolib_logg.o: $(srcdir)/src/generic/logg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/logg.cpp
  
+@COND_USE_GUI_1@monolib_markuptext.o: $(srcdir)/src/generic/markuptext.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/markuptext.cpp
+
+@COND_USE_GUI_1@monolib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
+
  @COND_USE_GUI_1@monolib_numdlgg.o: $(srcdir)/src/generic/numdlgg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/numdlgg.cpp
  
  @COND_USE_GUI_1@monolib_numdlgg.o: $(srcdir)/src/generic/numdlgg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/numdlgg.cpp
  
@@ -22686,6 +25856,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@monolib_renderg.o: $(srcdir)/src/generic/renderg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/renderg.cpp
  
  @COND_USE_GUI_1@monolib_renderg.o: $(srcdir)/src/generic/renderg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/renderg.cpp
  
+@COND_USE_GUI_1@monolib_richmsgdlgg.o: $(srcdir)/src/generic/richmsgdlgg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/richmsgdlgg.cpp
+
  @COND_USE_GUI_1@monolib_scrlwing.o: $(srcdir)/src/generic/scrlwing.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/scrlwing.cpp
  
  @COND_USE_GUI_1@monolib_scrlwing.o: $(srcdir)/src/generic/scrlwing.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/scrlwing.cpp
  
@@ -22704,6 +25877,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@monolib_statbmpg.o: $(srcdir)/src/generic/statbmpg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statbmpg.cpp
  
  @COND_USE_GUI_1@monolib_statbmpg.o: $(srcdir)/src/generic/statbmpg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/statbmpg.cpp
  
+@COND_USE_GUI_1@monolib_stattextg.o: $(srcdir)/src/generic/stattextg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/stattextg.cpp
+
  @COND_USE_GUI_1@monolib_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp
  
  @COND_USE_GUI_1@monolib_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp
  
@@ -22737,18 +25913,30 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@monolib_datavcmn.o: $(srcdir)/src/common/datavcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/datavcmn.cpp
  
  @COND_USE_GUI_1@monolib_datavcmn.o: $(srcdir)/src/common/datavcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/datavcmn.cpp
  
+@COND_USE_GUI_1@monolib_gridcmn.o: $(srcdir)/src/common/gridcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/gridcmn.cpp
+
  @COND_USE_GUI_1@monolib_hyperlnkcmn.o: $(srcdir)/src/common/hyperlnkcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/hyperlnkcmn.cpp
  
  @COND_USE_GUI_1@monolib_hyperlnkcmn.o: $(srcdir)/src/common/hyperlnkcmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/hyperlnkcmn.cpp
  
+@COND_USE_GUI_1@monolib_odcombocmn.o: $(srcdir)/src/common/odcombocmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/odcombocmn.cpp
+
  @COND_USE_GUI_1@monolib_aboutdlgg.o: $(srcdir)/src/generic/aboutdlgg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/aboutdlgg.cpp
  
  @COND_USE_GUI_1@monolib_aboutdlgg.o: $(srcdir)/src/generic/aboutdlgg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/aboutdlgg.cpp
  
+@COND_USE_GUI_1@monolib_bannerwindow.o: $(srcdir)/src/generic/bannerwindow.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/bannerwindow.cpp
+
  @COND_USE_GUI_1@monolib_bmpcboxg.o: $(srcdir)/src/generic/bmpcboxg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/bmpcboxg.cpp
  
  @COND_USE_GUI_1@monolib_calctrlg.o: $(srcdir)/src/generic/calctrlg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/calctrlg.cpp
  
  @COND_USE_GUI_1@monolib_bmpcboxg.o: $(srcdir)/src/generic/bmpcboxg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/bmpcboxg.cpp
  
  @COND_USE_GUI_1@monolib_calctrlg.o: $(srcdir)/src/generic/calctrlg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/calctrlg.cpp
  
+@COND_USE_GUI_1@monolib_commandlinkbuttong.o: $(srcdir)/src/generic/commandlinkbuttong.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/commandlinkbuttong.cpp
+
  @COND_USE_GUI_1@monolib_datavgen.o: $(srcdir)/src/generic/datavgen.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/datavgen.cpp
  
  @COND_USE_GUI_1@monolib_datavgen.o: $(srcdir)/src/generic/datavgen.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/datavgen.cpp
  
@@ -22764,6 +25952,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@monolib_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/gridctrl.cpp
  
  @COND_USE_GUI_1@monolib_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/gridctrl.cpp
  
+@COND_USE_GUI_1@monolib_grideditors.o: $(srcdir)/src/generic/grideditors.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/grideditors.cpp
+
  @COND_USE_GUI_1@monolib_gridsel.o: $(srcdir)/src/generic/gridsel.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/gridsel.cpp
  
  @COND_USE_GUI_1@monolib_gridsel.o: $(srcdir)/src/generic/gridsel.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/gridsel.cpp
  
@@ -22794,6 +25985,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@monolib_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tipdlg.cpp
  
  @COND_USE_GUI_1@monolib_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/tipdlg.cpp
  
+@COND_USE_GUI_1@monolib_treelist.o: $(srcdir)/src/generic/treelist.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/treelist.cpp
+
  @COND_USE_GUI_1@monolib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/wizard.cpp
  
  @COND_USE_GUI_1@monolib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/wizard.cpp
  
@@ -22827,11 +26021,38 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
  
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/sound.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/sound.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_joystick.o: $(srcdir)/src/msw/joystick.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
  @COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
  @COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
@@ -22839,6 +26060,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_OSX_COCOA_USE_GUI_1@     $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
  @COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_OSX_COCOA_USE_GUI_1@     $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
+@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+
  @COND_TOOLKIT_COCOA_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
@@ -22854,89 +26078,95 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
  @COND_USE_GUI_1_WXUNIV_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_carbon_aboutdlg.o: $(srcdir)/src/osx/carbon/aboutdlg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/aboutdlg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_carbon_drawer.o: $(srcdir)/src/osx/carbon/drawer.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/drawer.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_aboutdlg.o: $(srcdir)/src/osx/carbon/aboutdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/aboutdlg.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_dataview_osx.o: $(srcdir)/src/osx/dataview_osx.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/dataview_osx.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_aboutdlg.o: $(srcdir)/src/osx/cocoa/aboutdlg.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@     $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/aboutdlg.mm
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_dataview_osx.o: $(srcdir)/src/osx/dataview_osx.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@     $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/dataview_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_carbon_dataview.o: $(srcdir)/src/osx/carbon/dataview.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dataview.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_sound_osx.o: $(srcdir)/src/osx/sound_osx.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/sound_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_sound_osx.o: $(srcdir)/src/osx/sound_osx.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@     $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/sound_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_notifmsg.o: $(srcdir)/src/gtk/hildon/notifmsg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/hildon/notifmsg.cpp
+@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1@monolib_sound_osx.o: $(srcdir)/src/osx/sound_osx.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/sound_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_carbon_sound.o: $(srcdir)/src/osx/carbon/sound.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/sound.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_carbon_sound.o: $(srcdir)/src/osx/carbon/sound.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@     $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/sound.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_taskbar.o: $(srcdir)/src/osx/carbon/taskbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_carbon_taskbar.o: $(srcdir)/src/osx/carbon/taskbar.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/taskbar.cpp
  
  @COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/taskbar.cpp
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_taskbar.o: $(srcdir)/src/osx/carbon/taskbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@     $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/taskbar.cpp
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_taskbar.o: $(srcdir)/src/cocoa/taskbar.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/taskbar.mm
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@     $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_taskbar.o: $(srcdir)/src/gtk/taskbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/taskbar.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_taskbar.o: $(srcdir)/src/gtk1/taskbar.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/taskbar.cpp
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_core_sound.o: $(srcdir)/src/osx/core/sound.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@     $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/sound.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/msw/joystick.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp
+@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1@monolib_core_sound.o: $(srcdir)/src/osx/core/sound.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/sound.cpp
+
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_cocoa_aboutdlg.o: $(srcdir)/src/osx/cocoa/aboutdlg.mm $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@     $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/aboutdlg.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_cocoa_dataview.o: $(srcdir)/src/osx/cocoa/dataview.mm $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@     $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dataview.mm
+
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_osx_cocoa_taskbar.o: $(srcdir)/src/osx/cocoa/taskbar.mm $(MONOLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@     $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/taskbar.mm
+
+@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_src_cocoa_taskbar.o: $(srcdir)/src/cocoa/taskbar.mm $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/taskbar.mm
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
  @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
  @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monolib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(MONOLIB_ODEP)
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
-@COND_TOOLKIT_PM_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/os2/joystick.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/joystick.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_dataview.o: $(srcdir)/src/osx/carbon/dataview.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dataview.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dataview.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_databrow.o: $(srcdir)/src/osx/carbon/databrow.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/databrow.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@     $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monolib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
  
  @COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
  
  @COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
@@ -22953,30 +26183,45 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP)
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
  
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP)
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_taskbar.o: $(srcdir)/src/gtk/taskbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/taskbar.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(MONOLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk/eggtrayicon.c
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk/eggtrayicon.c
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_eggtrayicon.o: $(srcdir)/src/gtk1/eggtrayicon.c $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_hildon_notifmsg.o: $(srcdir)/src/gtk/hildon/notifmsg.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/hildon/notifmsg.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_eggtrayicon.o: $(srcdir)/src/gtk1/eggtrayicon.c $(MONOLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk1/eggtrayicon.c
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk1/eggtrayicon.c
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_bmpcbox.o: $(srcdir)/src/gtk/bmpcbox.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/bmpcbox.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gtk1_taskbar.o: $(srcdir)/src/gtk1/taskbar.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/taskbar.cpp
+
+@COND_TOOLKIT_PM_USE_GUI_1@monolib_os2_joystick.o: $(srcdir)/src/os2/joystick.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/joystick.cpp
+
+@COND_TOOLKIT_PM_USE_GUI_1@monolib_os2_sound.o: $(srcdir)/src/os2/sound.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/sound.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/bmpcbox.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/bmpcbox.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/bmpcbox.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/bmpcbox.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@monolib_calctrl.o: $(srcdir)/src/gtk/calctrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/calctrl.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
  
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
+
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp
  
@@ -22989,6 +26234,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp
  
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp
+
  @COND_TOOLKIT_MSW_USE_GUI_1@monolib_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@monolib_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp
  
@@ -23007,25 +26258,13 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_mediactrl_qt.o: $(srcdir)/src/msw/mediactrl_qt.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_qt.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_mediactrl_qt.o: $(srcdir)/src/msw/mediactrl_qt.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_qt.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_mediactrl.o: $(srcdir)/src/osx/carbon/mediactrl.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/mediactrl.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/mediactrl.mm
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
  
  @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
  
-@COND_TOOLKIT_GTK_USE_GUI_1@monolib_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_USE_GUI_1@monolib_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
  
  @COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
  
  @COND_PLATFORM_UNIX_1_USE_GUI_1@monolib_chm.o: $(srcdir)/src/html/chm.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
  
  @COND_PLATFORM_UNIX_1_USE_GUI_1@monolib_chm.o: $(srcdir)/src/html/chm.cpp $(MONOLIB_ODEP)
@@ -23035,7 +26274,10 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_PLATFORM_MACOSX_1_USE_GUI_1@     $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp
  
  basedll_version_rc.o: $(srcdir)/src/msw/version.rc $(BASEDLL_ODEP)
  @COND_PLATFORM_MACOSX_1_USE_GUI_1@     $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp
  
  basedll_version_rc.o: $(srcdir)/src/msw/version.rc $(BASEDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_54)  $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_55) $(__INC_REGEX_p_53) $(__INC_EXPAT_p_53) --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66)  $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1
+
+basedll_any.o: $(srcdir)/src/common/any.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/any.cpp
  
  basedll_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/appbase.cpp
  
  basedll_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/appbase.cpp
@@ -23070,6 +26312,9 @@ basedll_convauto.o: $(srcdir)/src/common/convauto.cpp $(BASEDLL_ODEP)
  basedll_datetime.o: $(srcdir)/src/common/datetime.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/datetime.cpp
  
  basedll_datetime.o: $(srcdir)/src/common/datetime.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/datetime.cpp
  
+basedll_datetimefmt.o: $(srcdir)/src/common/datetimefmt.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/datetimefmt.cpp
+
  basedll_datstrm.o: $(srcdir)/src/common/datstrm.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/datstrm.cpp
  
  basedll_datstrm.o: $(srcdir)/src/common/datstrm.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/datstrm.cpp
  
@@ -23145,6 +26390,9 @@ basedll_intl.o: $(srcdir)/src/common/intl.cpp $(BASEDLL_ODEP)
  basedll_ipcbase.o: $(srcdir)/src/common/ipcbase.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/ipcbase.cpp
  
  basedll_ipcbase.o: $(srcdir)/src/common/ipcbase.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/ipcbase.cpp
  
+basedll_languageinfo.o: $(srcdir)/src/common/languageinfo.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/languageinfo.cpp
+
  basedll_list.o: $(srcdir)/src/common/list.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/list.cpp
  
  basedll_list.o: $(srcdir)/src/common/list.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/list.cpp
  
@@ -23166,6 +26414,9 @@ basedll_module.o: $(srcdir)/src/common/module.cpp $(BASEDLL_ODEP)
  basedll_mstream.o: $(srcdir)/src/common/mstream.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/mstream.cpp
  
  basedll_mstream.o: $(srcdir)/src/common/mstream.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/mstream.cpp
  
+basedll_numformatter.o: $(srcdir)/src/common/numformatter.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/numformatter.cpp
+
  basedll_object.o: $(srcdir)/src/common/object.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/object.cpp
  
  basedll_object.o: $(srcdir)/src/common/object.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/object.cpp
  
@@ -23187,6 +26438,9 @@ basedll_stdpbase.o: $(srcdir)/src/common/stdpbase.cpp $(BASEDLL_ODEP)
  basedll_sstream.o: $(srcdir)/src/common/sstream.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/sstream.cpp
  
  basedll_sstream.o: $(srcdir)/src/common/sstream.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/sstream.cpp
  
+basedll_stdstream.o: $(srcdir)/src/common/stdstream.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/stdstream.cpp
+
  basedll_stopwatch.o: $(srcdir)/src/common/stopwatch.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/stopwatch.cpp
  
  basedll_stopwatch.o: $(srcdir)/src/common/stopwatch.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/stopwatch.cpp
  
@@ -23229,6 +26483,9 @@ basedll_timerimpl.o: $(srcdir)/src/common/timerimpl.cpp $(BASEDLL_ODEP)
  basedll_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/tokenzr.cpp
  
  basedll_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/tokenzr.cpp
  
+basedll_translation.o: $(srcdir)/src/common/translation.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/translation.cpp
+
  basedll_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/txtstrm.cpp
  
  basedll_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/txtstrm.cpp
  
@@ -23268,6 +26525,18 @@ basedll_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp $(BASEDLL_ODEP)
  basedll_zstream.o: $(srcdir)/src/common/zstream.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/zstream.cpp
  
  basedll_zstream.o: $(srcdir)/src/common/zstream.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/zstream.cpp
  
+basedll_fswatchercmn.o: $(srcdir)/src/common/fswatchercmn.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fswatchercmn.cpp
+
+basedll_fswatcherg.o: $(srcdir)/src/generic/fswatcherg.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/generic/fswatcherg.cpp
+
+basedll_unix_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp
+
+basedll_fswatcher_inotify.o: $(srcdir)/src/unix/fswatcher_inotify.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/fswatcher_inotify.cpp
+
  basedll_basemsw.o: $(srcdir)/src/msw/basemsw.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/basemsw.cpp
  
  basedll_basemsw.o: $(srcdir)/src/msw/basemsw.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/basemsw.cpp
  
@@ -23280,9 +26549,15 @@ basedll_debughlp.o: $(srcdir)/src/msw/debughlp.cpp $(BASEDLL_ODEP)
  basedll_dde.o: $(srcdir)/src/msw/dde.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/dde.cpp
  
  basedll_dde.o: $(srcdir)/src/msw/dde.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/dde.cpp
  
+basedll_msw_dir.o: $(srcdir)/src/msw/dir.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/dir.cpp
+
  basedll_dlmsw.o: $(srcdir)/src/msw/dlmsw.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/dlmsw.cpp
  
  basedll_dlmsw.o: $(srcdir)/src/msw/dlmsw.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/dlmsw.cpp
  
+basedll_msw_mimetype.o: $(srcdir)/src/msw/mimetype.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/mimetype.cpp
+
  basedll_power.o: $(srcdir)/src/msw/power.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/power.cpp
  
  basedll_power.o: $(srcdir)/src/msw/power.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/power.cpp
  
@@ -23292,17 +26567,41 @@ basedll_regconf.o: $(srcdir)/src/msw/regconf.cpp $(BASEDLL_ODEP)
  basedll_registry.o: $(srcdir)/src/msw/registry.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/registry.cpp
  
  basedll_registry.o: $(srcdir)/src/msw/registry.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/registry.cpp
  
+basedll_msw_snglinst.o: $(srcdir)/src/msw/snglinst.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/snglinst.cpp
+
+basedll_msw_stackwalk.o: $(srcdir)/src/msw/stackwalk.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/stackwalk.cpp
+
+basedll_msw_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/stdpaths.cpp
+
+basedll_msw_thread.o: $(srcdir)/src/msw/thread.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/thread.cpp
+
  basedll_timer.o: $(srcdir)/src/msw/timer.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/timer.cpp
  
  basedll_timer.o: $(srcdir)/src/msw/timer.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/timer.cpp
  
+basedll_msw_utils.o: $(srcdir)/src/msw/utils.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/utils.cpp
+
+basedll_msw_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/utilsexc.cpp
+
+basedll_fswatcher.o: $(srcdir)/src/msw/fswatcher.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/fswatcher.cpp
+
  basedll_time.o: $(srcdir)/src/msw/wince/time.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/wince/time.cpp
  
  basedll_time.o: $(srcdir)/src/msw/wince/time.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/wince/time.cpp
  
+basedll_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp
+
  basedll_cfstring.o: $(srcdir)/src/osx/core/cfstring.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/cfstring.cpp
  
  basedll_cfstring.o: $(srcdir)/src/osx/core/cfstring.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/cfstring.cpp
  
-basedll_gsockosx.o: $(srcdir)/src/osx/core/gsockosx.cpp $(BASEDLL_ODEP)
-       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/gsockosx.cpp
+basedll_evtloop_cf.o: $(srcdir)/src/osx/core/evtloop_cf.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/evtloop_cf.cpp
  
  basedll_stdpaths_cf.o: $(srcdir)/src/osx/core/stdpaths_cf.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/stdpaths_cf.cpp
  
  basedll_stdpaths_cf.o: $(srcdir)/src/osx/core/stdpaths_cf.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/stdpaths_cf.cpp
@@ -23313,6 +26612,33 @@ basedll_strconv_cf.o: $(srcdir)/src/osx/core/strconv_cf.cpp $(BASEDLL_ODEP)
  basedll_utilsexc_base.o: $(srcdir)/src/osx/core/utilsexc_base.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_base.cpp
  
  basedll_utilsexc_base.o: $(srcdir)/src/osx/core/utilsexc_base.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_base.cpp
  
+basedll_os2_dir.o: $(srcdir)/src/os2/dir.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/dir.cpp
+
+basedll_os2_mimetype.o: $(srcdir)/src/os2/mimetype.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/mimetype.cpp
+
+basedll_os2_snglinst.o: $(srcdir)/src/os2/snglinst.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/snglinst.cpp
+
+basedll_os2_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/stdpaths.cpp
+
+basedll_os2_thread.o: $(srcdir)/src/os2/thread.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/thread.cpp
+
+basedll_os2_utils.o: $(srcdir)/src/os2/utils.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/utils.cpp
+
+basedll_os2_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/utilsexc.cpp
+
+basedll_msdos_dir.o: $(srcdir)/src/msdos/dir.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msdos/dir.cpp
+
+basedll_msdos_mimetype.o: $(srcdir)/src/msdos/mimetype.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msdos/mimetype.cpp
+
  basedll_utilsdos.o: $(srcdir)/src/msdos/utilsdos.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msdos/utilsdos.cpp
  
  basedll_utilsdos.o: $(srcdir)/src/msdos/utilsdos.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msdos/utilsdos.cpp
  
@@ -23340,9 +26666,15 @@ basedll_mslu.o: $(srcdir)/src/msw/mslu.cpp $(BASEDLL_ODEP)
  basedll_volume.o: $(srcdir)/src/msw/volume.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/volume.cpp
  
  basedll_volume.o: $(srcdir)/src/msw/volume.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/volume.cpp
  
+basedll_carbon_utils.o: $(srcdir)/src/osx/carbon/utils.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/utils.cpp
+
  basedll_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/uma.cpp
  
  basedll_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/uma.cpp
  
+basedll_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm
+
  @COND_PLATFORM_UNIX_1@basedll_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp
  
  @COND_PLATFORM_UNIX_1@basedll_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp
  
@@ -23361,20 +26693,32 @@ basedll_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_OS2_1@basedll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
  
  @COND_PLATFORM_OS2_1@basedll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
  
-@COND_PLATFORM_UNIX_1@basedll_epolldispatcher.o: $(srcdir)/src/unix/epolldispatcher.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/epolldispatcher.cpp
-
-@COND_PLATFORM_MACOSX_1@basedll_epolldispatcher.o: $(srcdir)/src/unix/epolldispatcher.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/epolldispatcher.cpp
-
  @COND_PLATFORM_UNIX_1@basedll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
  
  @COND_PLATFORM_MACOSX_1@basedll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
  
  @COND_PLATFORM_UNIX_1@basedll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
  
  @COND_PLATFORM_MACOSX_1@basedll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
  
-@COND_PLATFORM_OS2_1@basedll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
+@COND_PLATFORM_OS2_1@basedll_appunix.o: $(srcdir)/src/unix/appunix.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
+
+@COND_PLATFORM_UNIX_1@basedll_unix_dir.o: $(srcdir)/src/unix/dir.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/dir.cpp
+
+@COND_PLATFORM_MACOSX_1@basedll_unix_dir.o: $(srcdir)/src/unix/dir.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/dir.cpp
+
+@COND_PLATFORM_UNIX_1@basedll_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
+
+@COND_PLATFORM_MACOSX_1@basedll_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
+
+@COND_PLATFORM_UNIX_1@basedll_epolldispatcher.o: $(srcdir)/src/unix/epolldispatcher.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/epolldispatcher.cpp
+
+@COND_PLATFORM_MACOSX_1@basedll_epolldispatcher.o: $(srcdir)/src/unix/epolldispatcher.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/epolldispatcher.cpp
  
  @COND_PLATFORM_UNIX_1@basedll_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
  
  @COND_PLATFORM_UNIX_1@basedll_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
@@ -23385,48 +26729,30 @@ basedll_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_OS2_1@basedll_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
  
  @COND_PLATFORM_OS2_1@basedll_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
  
-@COND_PLATFORM_UNIX_1@basedll_dir.o: $(srcdir)/src/unix/dir.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/dir.cpp
-
-@COND_PLATFORM_MACOSX_1@basedll_dir.o: $(srcdir)/src/unix/dir.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/dir.cpp
-
-@COND_PLATFORM_WIN32_1@basedll_dir.o: $(srcdir)/src/msw/dir.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/dir.cpp
-
-@COND_PLATFORM_OS2_1@basedll_dir.o: $(srcdir)/src/os2/dir.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/dir.cpp
-
-@COND_PLATFORM_MSDOS_1@basedll_dir.o: $(srcdir)/src/msdos/dir.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MSDOS_1@        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msdos/dir.cpp
-
-@COND_PLATFORM_UNIX_1@basedll_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
+@COND_PLATFORM_UNIX_1@basedll_fdiounix.o: $(srcdir)/src/unix/fdiounix.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/fdiounix.cpp
  
  
-@COND_PLATFORM_MACOSX_1@basedll_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
+@COND_PLATFORM_MACOSX_1@basedll_fdiounix.o: $(srcdir)/src/unix/fdiounix.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/fdiounix.cpp
  
  
-@COND_PLATFORM_UNIX_1@basedll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_UNIX_1@basedll_unix_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
  
  @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
  
-@COND_PLATFORM_MACOSX_1@basedll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1@basedll_unix_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
  
  @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
  
-@COND_PLATFORM_WIN32_1@basedll_snglinst.o: $(srcdir)/src/msw/snglinst.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/snglinst.cpp
+@COND_PLATFORM_UNIX_1@basedll_unix_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/stackwalk.cpp
+
+@COND_PLATFORM_MACOSX_1@basedll_unix_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/stackwalk.cpp
  
  
-@COND_PLATFORM_UNIX_1@basedll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_UNIX_1@basedll_unix_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/stdpaths.cpp
  
  @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/stdpaths.cpp
  
-@COND_PLATFORM_MACOSX_1@basedll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1@basedll_unix_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/stdpaths.cpp
  
  @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/stdpaths.cpp
  
-@COND_PLATFORM_WIN32_1@basedll_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/stdpaths.cpp
-
-@COND_PLATFORM_OS2_1@basedll_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/stdpaths.cpp
-
  @COND_PLATFORM_UNIX_1@basedll_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
  
  @COND_PLATFORM_UNIX_1@basedll_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
  
@@ -23442,65 +26768,20 @@ basedll_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_MACOSX_1@basedll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/threadpsx.cpp
  
  @COND_PLATFORM_MACOSX_1@basedll_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/threadpsx.cpp
  
-@COND_PLATFORM_UNIX_1@basedll_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/stackwalk.cpp
-
-@COND_PLATFORM_MACOSX_1@basedll_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/stackwalk.cpp
-
-@COND_PLATFORM_WIN32_1@basedll_stackwalk.o: $(srcdir)/src/msw/stackwalk.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/stackwalk.cpp
-
  @COND_PLATFORM_UNIX_1@basedll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
  
  @COND_PLATFORM_MACOSX_1@basedll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
  
  @COND_PLATFORM_UNIX_1@basedll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
  
  @COND_PLATFORM_MACOSX_1@basedll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
  
-@COND_PLATFORM_UNIX_1@basedll_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp
-
-@COND_PLATFORM_WIN32_1@basedll_mimetype.o: $(srcdir)/src/msw/mimetype.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/mimetype.cpp
-
-@COND_PLATFORM_MACOSX_1@basedll_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp
-
-@COND_PLATFORM_OS2_1@basedll_mimetype.o: $(srcdir)/src/os2/mimetype.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/mimetype.cpp
-
-@COND_PLATFORM_MSDOS_1@basedll_mimetype.o: $(srcdir)/src/msdos/mimetype.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_MSDOS_1@        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msdos/mimetype.cpp
-
-@COND_PLATFORM_UNIX_1@basedll_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
-
-@COND_PLATFORM_OS2_1@basedll_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
+@COND_PLATFORM_UNIX_1@basedll_fswatcher_kqueue.o: $(srcdir)/src/unix/fswatcher_kqueue.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/fswatcher_kqueue.cpp
  
  
-@COND_PLATFORM_WIN32_1@basedll_thread.o: $(srcdir)/src/msw/thread.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/thread.cpp
+@COND_PLATFORM_MACOSX_1@basedll_fswatcher_kqueue.o: $(srcdir)/src/unix/fswatcher_kqueue.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/fswatcher_kqueue.cpp
  
  
-@COND_PLATFORM_OS2_1@basedll_thread.o: $(srcdir)/src/os2/thread.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/thread.cpp
-
-@COND_PLATFORM_WIN32_1@basedll_utils.o: $(srcdir)/src/msw/utils.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/utils.cpp
-
-@COND_PLATFORM_OS2_1@basedll_utils.o: $(srcdir)/src/os2/utils.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/utils.cpp
-
-@COND_TOOLKIT_OSX_CARBON@basedll_utils.o: $(srcdir)/src/osx/carbon/utils.cpp $(BASEDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/utils.cpp
-
-@COND_TOOLKIT_OSX_COCOA@basedll_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(BASEDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm
-
-@COND_PLATFORM_WIN32_1@basedll_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/msw/utilsexc.cpp
-
-@COND_PLATFORM_OS2_1@basedll_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp $(BASEDLL_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/os2/utilsexc.cpp
+baselib_any.o: $(srcdir)/src/common/any.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/any.cpp
  
  baselib_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/appbase.cpp
  
  baselib_appbase.o: $(srcdir)/src/common/appbase.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/appbase.cpp
@@ -23535,6 +26816,9 @@ baselib_convauto.o: $(srcdir)/src/common/convauto.cpp $(BASELIB_ODEP)
  baselib_datetime.o: $(srcdir)/src/common/datetime.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/datetime.cpp
  
  baselib_datetime.o: $(srcdir)/src/common/datetime.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/datetime.cpp
  
+baselib_datetimefmt.o: $(srcdir)/src/common/datetimefmt.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/datetimefmt.cpp
+
  baselib_datstrm.o: $(srcdir)/src/common/datstrm.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/datstrm.cpp
  
  baselib_datstrm.o: $(srcdir)/src/common/datstrm.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/datstrm.cpp
  
@@ -23610,6 +26894,9 @@ baselib_intl.o: $(srcdir)/src/common/intl.cpp $(BASELIB_ODEP)
  baselib_ipcbase.o: $(srcdir)/src/common/ipcbase.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/ipcbase.cpp
  
  baselib_ipcbase.o: $(srcdir)/src/common/ipcbase.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/ipcbase.cpp
  
+baselib_languageinfo.o: $(srcdir)/src/common/languageinfo.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/languageinfo.cpp
+
  baselib_list.o: $(srcdir)/src/common/list.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/list.cpp
  
  baselib_list.o: $(srcdir)/src/common/list.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/list.cpp
  
@@ -23631,6 +26918,9 @@ baselib_module.o: $(srcdir)/src/common/module.cpp $(BASELIB_ODEP)
  baselib_mstream.o: $(srcdir)/src/common/mstream.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/mstream.cpp
  
  baselib_mstream.o: $(srcdir)/src/common/mstream.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/mstream.cpp
  
+baselib_numformatter.o: $(srcdir)/src/common/numformatter.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/numformatter.cpp
+
  baselib_object.o: $(srcdir)/src/common/object.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/object.cpp
  
  baselib_object.o: $(srcdir)/src/common/object.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/object.cpp
  
@@ -23652,6 +26942,9 @@ baselib_stdpbase.o: $(srcdir)/src/common/stdpbase.cpp $(BASELIB_ODEP)
  baselib_sstream.o: $(srcdir)/src/common/sstream.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/sstream.cpp
  
  baselib_sstream.o: $(srcdir)/src/common/sstream.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/sstream.cpp
  
+baselib_stdstream.o: $(srcdir)/src/common/stdstream.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/stdstream.cpp
+
  baselib_stopwatch.o: $(srcdir)/src/common/stopwatch.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/stopwatch.cpp
  
  baselib_stopwatch.o: $(srcdir)/src/common/stopwatch.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/stopwatch.cpp
  
@@ -23694,6 +26987,9 @@ baselib_timerimpl.o: $(srcdir)/src/common/timerimpl.cpp $(BASELIB_ODEP)
  baselib_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/tokenzr.cpp
  
  baselib_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/tokenzr.cpp
  
+baselib_translation.o: $(srcdir)/src/common/translation.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/translation.cpp
+
  baselib_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/txtstrm.cpp
  
  baselib_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/txtstrm.cpp
  
@@ -23733,6 +27029,18 @@ baselib_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp $(BASELIB_ODEP)
  baselib_zstream.o: $(srcdir)/src/common/zstream.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/zstream.cpp
  
  baselib_zstream.o: $(srcdir)/src/common/zstream.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/zstream.cpp
  
+baselib_fswatchercmn.o: $(srcdir)/src/common/fswatchercmn.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/fswatchercmn.cpp
+
+baselib_fswatcherg.o: $(srcdir)/src/generic/fswatcherg.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/generic/fswatcherg.cpp
+
+baselib_unix_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp
+
+baselib_fswatcher_inotify.o: $(srcdir)/src/unix/fswatcher_inotify.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/fswatcher_inotify.cpp
+
  baselib_basemsw.o: $(srcdir)/src/msw/basemsw.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/basemsw.cpp
  
  baselib_basemsw.o: $(srcdir)/src/msw/basemsw.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/basemsw.cpp
  
@@ -23745,9 +27053,15 @@ baselib_debughlp.o: $(srcdir)/src/msw/debughlp.cpp $(BASELIB_ODEP)
  baselib_dde.o: $(srcdir)/src/msw/dde.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/dde.cpp
  
  baselib_dde.o: $(srcdir)/src/msw/dde.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/dde.cpp
  
+baselib_msw_dir.o: $(srcdir)/src/msw/dir.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/dir.cpp
+
  baselib_dlmsw.o: $(srcdir)/src/msw/dlmsw.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/dlmsw.cpp
  
  baselib_dlmsw.o: $(srcdir)/src/msw/dlmsw.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/dlmsw.cpp
  
+baselib_msw_mimetype.o: $(srcdir)/src/msw/mimetype.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/mimetype.cpp
+
  baselib_power.o: $(srcdir)/src/msw/power.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/power.cpp
  
  baselib_power.o: $(srcdir)/src/msw/power.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/power.cpp
  
@@ -23757,17 +27071,41 @@ baselib_regconf.o: $(srcdir)/src/msw/regconf.cpp $(BASELIB_ODEP)
  baselib_registry.o: $(srcdir)/src/msw/registry.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/registry.cpp
  
  baselib_registry.o: $(srcdir)/src/msw/registry.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/registry.cpp
  
+baselib_msw_snglinst.o: $(srcdir)/src/msw/snglinst.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/snglinst.cpp
+
+baselib_msw_stackwalk.o: $(srcdir)/src/msw/stackwalk.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/stackwalk.cpp
+
+baselib_msw_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/stdpaths.cpp
+
+baselib_msw_thread.o: $(srcdir)/src/msw/thread.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/thread.cpp
+
  baselib_timer.o: $(srcdir)/src/msw/timer.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/timer.cpp
  
  baselib_timer.o: $(srcdir)/src/msw/timer.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/timer.cpp
  
+baselib_msw_utils.o: $(srcdir)/src/msw/utils.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/utils.cpp
+
+baselib_msw_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/utilsexc.cpp
+
+baselib_fswatcher.o: $(srcdir)/src/msw/fswatcher.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/fswatcher.cpp
+
  baselib_time.o: $(srcdir)/src/msw/wince/time.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/wince/time.cpp
  
  baselib_time.o: $(srcdir)/src/msw/wince/time.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/wince/time.cpp
  
+baselib_core_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp
+
  baselib_cfstring.o: $(srcdir)/src/osx/core/cfstring.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/cfstring.cpp
  
  baselib_cfstring.o: $(srcdir)/src/osx/core/cfstring.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/cfstring.cpp
  
-baselib_gsockosx.o: $(srcdir)/src/osx/core/gsockosx.cpp $(BASELIB_ODEP)
-       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/gsockosx.cpp
+baselib_evtloop_cf.o: $(srcdir)/src/osx/core/evtloop_cf.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/evtloop_cf.cpp
  
  baselib_stdpaths_cf.o: $(srcdir)/src/osx/core/stdpaths_cf.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/stdpaths_cf.cpp
  
  baselib_stdpaths_cf.o: $(srcdir)/src/osx/core/stdpaths_cf.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/stdpaths_cf.cpp
@@ -23778,6 +27116,33 @@ baselib_strconv_cf.o: $(srcdir)/src/osx/core/strconv_cf.cpp $(BASELIB_ODEP)
  baselib_utilsexc_base.o: $(srcdir)/src/osx/core/utilsexc_base.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_base.cpp
  
  baselib_utilsexc_base.o: $(srcdir)/src/osx/core/utilsexc_base.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_base.cpp
  
+baselib_os2_dir.o: $(srcdir)/src/os2/dir.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/dir.cpp
+
+baselib_os2_mimetype.o: $(srcdir)/src/os2/mimetype.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/mimetype.cpp
+
+baselib_os2_snglinst.o: $(srcdir)/src/os2/snglinst.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/snglinst.cpp
+
+baselib_os2_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/stdpaths.cpp
+
+baselib_os2_thread.o: $(srcdir)/src/os2/thread.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/thread.cpp
+
+baselib_os2_utils.o: $(srcdir)/src/os2/utils.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/utils.cpp
+
+baselib_os2_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/utilsexc.cpp
+
+baselib_msdos_dir.o: $(srcdir)/src/msdos/dir.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msdos/dir.cpp
+
+baselib_msdos_mimetype.o: $(srcdir)/src/msdos/mimetype.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msdos/mimetype.cpp
+
  baselib_utilsdos.o: $(srcdir)/src/msdos/utilsdos.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msdos/utilsdos.cpp
  
  baselib_utilsdos.o: $(srcdir)/src/msdos/utilsdos.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msdos/utilsdos.cpp
  
@@ -23805,9 +27170,15 @@ baselib_mslu.o: $(srcdir)/src/msw/mslu.cpp $(BASELIB_ODEP)
  baselib_volume.o: $(srcdir)/src/msw/volume.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/volume.cpp
  
  baselib_volume.o: $(srcdir)/src/msw/volume.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/volume.cpp
  
+baselib_carbon_utils.o: $(srcdir)/src/osx/carbon/utils.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/utils.cpp
+
  baselib_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/uma.cpp
  
  baselib_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/uma.cpp
  
+baselib_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm
+
  @COND_PLATFORM_UNIX_1@baselib_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp
  
  @COND_PLATFORM_UNIX_1@baselib_fdiodispatcher.o: $(srcdir)/src/common/fdiodispatcher.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/fdiodispatcher.cpp
  
@@ -23826,12 +27197,6 @@ baselib_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_OS2_1@baselib_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
  
  @COND_PLATFORM_OS2_1@baselib_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
  
-@COND_PLATFORM_UNIX_1@baselib_epolldispatcher.o: $(srcdir)/src/unix/epolldispatcher.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/epolldispatcher.cpp
-
-@COND_PLATFORM_MACOSX_1@baselib_epolldispatcher.o: $(srcdir)/src/unix/epolldispatcher.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/epolldispatcher.cpp
-
  @COND_PLATFORM_UNIX_1@baselib_appunix.o: $(srcdir)/src/unix/appunix.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
  
  @COND_PLATFORM_UNIX_1@baselib_appunix.o: $(srcdir)/src/unix/appunix.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
  
@@ -23841,6 +27206,24 @@ baselib_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_OS2_1@baselib_appunix.o: $(srcdir)/src/unix/appunix.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
  
  @COND_PLATFORM_OS2_1@baselib_appunix.o: $(srcdir)/src/unix/appunix.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/appunix.cpp
  
+@COND_PLATFORM_UNIX_1@baselib_unix_dir.o: $(srcdir)/src/unix/dir.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/dir.cpp
+
+@COND_PLATFORM_MACOSX_1@baselib_unix_dir.o: $(srcdir)/src/unix/dir.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/dir.cpp
+
+@COND_PLATFORM_UNIX_1@baselib_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
+
+@COND_PLATFORM_MACOSX_1@baselib_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
+
+@COND_PLATFORM_UNIX_1@baselib_epolldispatcher.o: $(srcdir)/src/unix/epolldispatcher.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/epolldispatcher.cpp
+
+@COND_PLATFORM_MACOSX_1@baselib_epolldispatcher.o: $(srcdir)/src/unix/epolldispatcher.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/epolldispatcher.cpp
+
  @COND_PLATFORM_UNIX_1@baselib_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
  
  @COND_PLATFORM_UNIX_1@baselib_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
  
@@ -23850,48 +27233,30 @@ baselib_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_OS2_1@baselib_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
  
  @COND_PLATFORM_OS2_1@baselib_evtloopunix.o: $(srcdir)/src/unix/evtloopunix.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/evtloopunix.cpp
  
-@COND_PLATFORM_UNIX_1@baselib_dir.o: $(srcdir)/src/unix/dir.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/dir.cpp
-
-@COND_PLATFORM_MACOSX_1@baselib_dir.o: $(srcdir)/src/unix/dir.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/dir.cpp
-
-@COND_PLATFORM_WIN32_1@baselib_dir.o: $(srcdir)/src/msw/dir.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/dir.cpp
-
-@COND_PLATFORM_OS2_1@baselib_dir.o: $(srcdir)/src/os2/dir.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/dir.cpp
-
-@COND_PLATFORM_MSDOS_1@baselib_dir.o: $(srcdir)/src/msdos/dir.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_MSDOS_1@        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msdos/dir.cpp
+@COND_PLATFORM_UNIX_1@baselib_fdiounix.o: $(srcdir)/src/unix/fdiounix.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/fdiounix.cpp
  
  
-@COND_PLATFORM_UNIX_1@baselib_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
-
-@COND_PLATFORM_MACOSX_1@baselib_dlunix.o: $(srcdir)/src/unix/dlunix.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/dlunix.cpp
+@COND_PLATFORM_MACOSX_1@baselib_fdiounix.o: $(srcdir)/src/unix/fdiounix.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/fdiounix.cpp
  
  
-@COND_PLATFORM_UNIX_1@baselib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_UNIX_1@baselib_unix_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
  
  @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
  
-@COND_PLATFORM_MACOSX_1@baselib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1@baselib_unix_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
  
  @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
  
-@COND_PLATFORM_WIN32_1@baselib_snglinst.o: $(srcdir)/src/msw/snglinst.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/snglinst.cpp
+@COND_PLATFORM_UNIX_1@baselib_unix_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/stackwalk.cpp
+
+@COND_PLATFORM_MACOSX_1@baselib_unix_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/stackwalk.cpp
  
  
-@COND_PLATFORM_UNIX_1@baselib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_UNIX_1@baselib_unix_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/stdpaths.cpp
  
  @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/stdpaths.cpp
  
-@COND_PLATFORM_MACOSX_1@baselib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1@baselib_unix_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/stdpaths.cpp
  
  @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/stdpaths.cpp
  
-@COND_PLATFORM_WIN32_1@baselib_stdpaths.o: $(srcdir)/src/msw/stdpaths.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/stdpaths.cpp
-
-@COND_PLATFORM_OS2_1@baselib_stdpaths.o: $(srcdir)/src/os2/stdpaths.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/stdpaths.cpp
-
  @COND_PLATFORM_UNIX_1@baselib_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
  
  @COND_PLATFORM_UNIX_1@baselib_timerunx.o: $(srcdir)/src/unix/timerunx.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/timerunx.cpp
  
@@ -23907,68 +27272,20 @@ baselib_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_MACOSX_1@baselib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/threadpsx.cpp
  
  @COND_PLATFORM_MACOSX_1@baselib_threadpsx.o: $(srcdir)/src/unix/threadpsx.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/threadpsx.cpp
  
-@COND_PLATFORM_UNIX_1@baselib_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/stackwalk.cpp
-
-@COND_PLATFORM_MACOSX_1@baselib_stackwalk.o: $(srcdir)/src/unix/stackwalk.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/stackwalk.cpp
-
-@COND_PLATFORM_WIN32_1@baselib_stackwalk.o: $(srcdir)/src/msw/stackwalk.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/stackwalk.cpp
-
  @COND_PLATFORM_UNIX_1@baselib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
  
  @COND_PLATFORM_MACOSX_1@baselib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
  
  @COND_PLATFORM_UNIX_1@baselib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
  
  @COND_PLATFORM_MACOSX_1@baselib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
  
-@COND_PLATFORM_UNIX_1@baselib_mimetype.o: $(srcdir)/src/unix/mimetype.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/mimetype.cpp
-
-@COND_PLATFORM_WIN32_1@baselib_mimetype.o: $(srcdir)/src/msw/mimetype.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/mimetype.cpp
+@COND_PLATFORM_UNIX_1@baselib_fswatcher_kqueue.o: $(srcdir)/src/unix/fswatcher_kqueue.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/fswatcher_kqueue.cpp
  
  
-@COND_PLATFORM_MACOSX_1@baselib_mimetype.o: $(srcdir)/src/osx/core/mimetype.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/core/mimetype.cpp
-
-@COND_PLATFORM_OS2_1@baselib_mimetype.o: $(srcdir)/src/os2/mimetype.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/mimetype.cpp
-
-@COND_PLATFORM_MSDOS_1@baselib_mimetype.o: $(srcdir)/src/msdos/mimetype.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_MSDOS_1@        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msdos/mimetype.cpp
-
-@COND_PLATFORM_UNIX_1@baselib_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
-
-@COND_PLATFORM_OS2_1@baselib_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
-
-@COND_PLATFORM_WIN32_1@baselib_thread.o: $(srcdir)/src/msw/thread.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/thread.cpp
-
-@COND_PLATFORM_OS2_1@baselib_thread.o: $(srcdir)/src/os2/thread.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/thread.cpp
-
-@COND_PLATFORM_WIN32_1@baselib_utils.o: $(srcdir)/src/msw/utils.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/utils.cpp
-
-@COND_PLATFORM_OS2_1@baselib_utils.o: $(srcdir)/src/os2/utils.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/utils.cpp
-
-@COND_TOOLKIT_OSX_CARBON@baselib_utils.o: $(srcdir)/src/osx/carbon/utils.cpp $(BASELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/utils.cpp
-
-@COND_TOOLKIT_OSX_COCOA@baselib_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(BASELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm
-
-@COND_PLATFORM_WIN32_1@baselib_utilsexc.o: $(srcdir)/src/msw/utilsexc.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/msw/utilsexc.cpp
-
-@COND_PLATFORM_OS2_1@baselib_utilsexc.o: $(srcdir)/src/os2/utilsexc.cpp $(BASELIB_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/os2/utilsexc.cpp
+@COND_PLATFORM_MACOSX_1@baselib_fswatcher_kqueue.o: $(srcdir)/src/unix/fswatcher_kqueue.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/fswatcher_kqueue.cpp
  
  netdll_version_rc.o: $(srcdir)/src/msw/version.rc $(NETDLL_ODEP)
  
  netdll_version_rc.o: $(srcdir)/src/msw/version.rc $(NETDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_54)  $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_55) $(__INC_REGEX_p_53) $(__INC_EXPAT_p_53) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66)  $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET
  
  netdll_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(NETDLL_ODEP)
         $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp
  
  netdll_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(NETDLL_ODEP)
         $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp
@@ -24000,8 +27317,8 @@ netdll_socket.o: $(srcdir)/src/common/socket.cpp $(NETDLL_ODEP)
  netdll_url.o: $(srcdir)/src/common/url.cpp $(NETDLL_ODEP)
         $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/common/url.cpp
  
  netdll_url.o: $(srcdir)/src/common/url.cpp $(NETDLL_ODEP)
         $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/common/url.cpp
  
-netdll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(NETDLL_ODEP)
-       $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/msw/gsockmsw.cpp
+netdll_sockmsw.o: $(srcdir)/src/msw/sockmsw.cpp $(NETDLL_ODEP)
+       $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/msw/sockmsw.cpp
  
  netdll_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(NETDLL_ODEP)
         $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/msw/urlmsw.cpp
  
  netdll_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(NETDLL_ODEP)
         $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/msw/urlmsw.cpp
@@ -24009,17 +27326,23 @@ netdll_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(NETDLL_ODEP)
  netdll_net.o: $(srcdir)/src/msw/wince/net.cpp $(NETDLL_ODEP)
         $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/msw/wince/net.cpp
  
  netdll_net.o: $(srcdir)/src/msw/wince/net.cpp $(NETDLL_ODEP)
         $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/msw/wince/net.cpp
  
-@COND_PLATFORM_UNIX_1@netdll_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETDLL_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
+netdll_sockosx.o: $(srcdir)/src/osx/core/sockosx.cpp $(NETDLL_ODEP)
+       $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/osx/core/sockosx.cpp
  
  
-@COND_PLATFORM_MACOSX_1@netdll_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETDLL_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
+@COND_PLATFORM_UNIX_1@netdll_socketiohandler.o: $(srcdir)/src/common/socketiohandler.cpp $(NETDLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/common/socketiohandler.cpp
  
  
-@COND_PLATFORM_OS2_1@netdll_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETDLL_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
+@COND_PLATFORM_MACOSX_1@netdll_socketiohandler.o: $(srcdir)/src/common/socketiohandler.cpp $(NETDLL_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/common/socketiohandler.cpp
  
  
-@COND_PLATFORM_WIN32_1@netdll_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(NETDLL_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/msw/gsocket.cpp
+@COND_PLATFORM_UNIX_1@netdll_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(NETDLL_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp
+
+@COND_PLATFORM_MACOSX_1@netdll_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(NETDLL_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp
+
+@COND_PLATFORM_OS2_1@netdll_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(NETDLL_ODEP)
+@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp
  
  netlib_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(NETLIB_ODEP)
         $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp
  
  netlib_fs_inet.o: $(srcdir)/src/common/fs_inet.cpp $(NETLIB_ODEP)
         $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/common/fs_inet.cpp
@@ -24051,8 +27374,8 @@ netlib_socket.o: $(srcdir)/src/common/socket.cpp $(NETLIB_ODEP)
  netlib_url.o: $(srcdir)/src/common/url.cpp $(NETLIB_ODEP)
         $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/common/url.cpp
  
  netlib_url.o: $(srcdir)/src/common/url.cpp $(NETLIB_ODEP)
         $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/common/url.cpp
  
-netlib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(NETLIB_ODEP)
-       $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/msw/gsockmsw.cpp
+netlib_sockmsw.o: $(srcdir)/src/msw/sockmsw.cpp $(NETLIB_ODEP)
+       $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/msw/sockmsw.cpp
  
  netlib_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(NETLIB_ODEP)
         $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/msw/urlmsw.cpp
  
  netlib_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(NETLIB_ODEP)
         $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/msw/urlmsw.cpp
@@ -24060,20 +27383,26 @@ netlib_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(NETLIB_ODEP)
  netlib_net.o: $(srcdir)/src/msw/wince/net.cpp $(NETLIB_ODEP)
         $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/msw/wince/net.cpp
  
  netlib_net.o: $(srcdir)/src/msw/wince/net.cpp $(NETLIB_ODEP)
         $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/msw/wince/net.cpp
  
-@COND_PLATFORM_UNIX_1@netlib_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETLIB_ODEP)
-@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
+netlib_sockosx.o: $(srcdir)/src/osx/core/sockosx.cpp $(NETLIB_ODEP)
+       $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/osx/core/sockosx.cpp
+
+@COND_PLATFORM_UNIX_1@netlib_socketiohandler.o: $(srcdir)/src/common/socketiohandler.cpp $(NETLIB_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/common/socketiohandler.cpp
+
+@COND_PLATFORM_MACOSX_1@netlib_socketiohandler.o: $(srcdir)/src/common/socketiohandler.cpp $(NETLIB_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/common/socketiohandler.cpp
  
  
-@COND_PLATFORM_MACOSX_1@netlib_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETLIB_ODEP)
-@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
+@COND_PLATFORM_UNIX_1@netlib_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(NETLIB_ODEP)
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp
  
  
-@COND_PLATFORM_OS2_1@netlib_gsocket.o: $(srcdir)/src/unix/gsocket.cpp $(NETLIB_ODEP)
-@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/unix/gsocket.cpp
+@COND_PLATFORM_MACOSX_1@netlib_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(NETLIB_ODEP)
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp
  
  
-@COND_PLATFORM_WIN32_1@netlib_gsocket.o: $(srcdir)/src/msw/gsocket.cpp $(NETLIB_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/msw/gsocket.cpp
+@COND_PLATFORM_OS2_1@netlib_sockunix.o: $(srcdir)/src/unix/sockunix.cpp $(NETLIB_ODEP)
+@COND_PLATFORM_OS2_1@  $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/unix/sockunix.cpp
  
  coredll_version_rc.o: $(srcdir)/src/msw/version.rc $(COREDLL_ODEP)
  
  coredll_version_rc.o: $(srcdir)/src/msw/version.rc $(COREDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_54)  $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_55) $(__INC_REGEX_p_53) $(__INC_EXPAT_p_53) --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66)  $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0
  
  coredll_event.o: $(srcdir)/src/common/event.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/event.cpp
  
  coredll_event.o: $(srcdir)/src/common/event.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/event.cpp
@@ -24087,57 +27416,438 @@ coredll_msgout.o: $(srcdir)/src/common/msgout.cpp $(COREDLL_ODEP)
  coredll_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/utilscmn.cpp
  
  coredll_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/utilscmn.cpp
  
+coredll_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
+
+coredll_msw_main.o: $(srcdir)/src/msw/main.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/main.cpp
+
  coredll_mslu.o: $(srcdir)/src/msw/mslu.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/mslu.cpp
  
  coredll_volume.o: $(srcdir)/src/msw/volume.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/volume.cpp
  
  coredll_mslu.o: $(srcdir)/src/msw/mslu.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/mslu.cpp
  
  coredll_volume.o: $(srcdir)/src/msw/volume.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/volume.cpp
  
+coredll_carbon_utils.o: $(srcdir)/src/osx/carbon/utils.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/utils.cpp
+
  coredll_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/uma.cpp
  
  coredll_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/uma.cpp
  
-coredll_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp
+coredll_osx_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm
+
+coredll_gtk_anybutton.o: $(srcdir)/src/gtk/anybutton.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/anybutton.cpp
  
  coredll_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp
  
  
  coredll_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp
  
+coredll_gtk_bmpbuttn.o: $(srcdir)/src/gtk/bmpbuttn.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/bmpbuttn.cpp
+
+coredll_gtk_button.o: $(srcdir)/src/gtk/button.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/button.cpp
+
+coredll_gtk_checkbox.o: $(srcdir)/src/gtk/checkbox.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/checkbox.cpp
+
+coredll_gtk_checklst.o: $(srcdir)/src/gtk/checklst.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/checklst.cpp
+
+coredll_gtk_choice.o: $(srcdir)/src/gtk/choice.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/choice.cpp
+
  coredll_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp
  
  coredll_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp
  
+coredll_gtk_colordlg.o: $(srcdir)/src/gtk/colordlg.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/colordlg.cpp
+
+coredll_gtk_combobox.o: $(srcdir)/src/gtk/combobox.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/combobox.cpp
+
+coredll_gtk_control.o: $(srcdir)/src/gtk/control.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/control.cpp
+
  coredll_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp
  
  coredll_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp
  
+coredll_gtk_dialog.o: $(srcdir)/src/gtk/dialog.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dialog.cpp
+
  coredll_fontpicker.o: $(srcdir)/src/gtk/fontpicker.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/fontpicker.cpp
  
  coredll_filepicker.o: $(srcdir)/src/gtk/filepicker.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/filepicker.cpp
  
  coredll_fontpicker.o: $(srcdir)/src/gtk/fontpicker.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/fontpicker.cpp
  
  coredll_filepicker.o: $(srcdir)/src/gtk/filepicker.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/filepicker.cpp
  
+coredll_gtk_dirdlg.o: $(srcdir)/src/gtk/dirdlg.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dirdlg.cpp
+
+coredll_gtk_filedlg.o: $(srcdir)/src/gtk/filedlg.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/filedlg.cpp
+
+coredll_gtk_fontdlg.o: $(srcdir)/src/gtk/fontdlg.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/fontdlg.cpp
+
+coredll_gtk_frame.o: $(srcdir)/src/gtk/frame.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/frame.cpp
+
+coredll_gtk_gauge.o: $(srcdir)/src/gtk/gauge.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/gauge.cpp
+
  coredll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/gnome/gprint.cpp
  
  coredll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/gnome/gprint.cpp
  
-coredll_gvfs.o: $(srcdir)/src/gtk/gnome/gvfs.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/gnome/gvfs.cpp
+coredll_gvfs.o: $(srcdir)/src/gtk/gnome/gvfs.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/gnome/gvfs.cpp
+
+coredll_gtk_infobar.o: $(srcdir)/src/gtk/infobar.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/infobar.cpp
+
+coredll_gtk_listbox.o: $(srcdir)/src/gtk/listbox.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/listbox.cpp
+
+coredll_gtk_mdi.o: $(srcdir)/src/gtk/mdi.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/mdi.cpp
+
+coredll_gtk_menu.o: $(srcdir)/src/gtk/menu.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/menu.cpp
+
+coredll_gtk_mnemonics.o: $(srcdir)/src/gtk/mnemonics.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/mnemonics.cpp
+
+coredll_gtk_msgdlg.o: $(srcdir)/src/gtk/msgdlg.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/msgdlg.cpp
+
+coredll_gtk_nativewin.o: $(srcdir)/src/gtk/nativewin.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/nativewin.cpp
+
+coredll_gtk_notebook.o: $(srcdir)/src/gtk/notebook.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/notebook.cpp
+
+coredll_gtk_print.o: $(srcdir)/src/gtk/print.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/print.cpp
+
+coredll_gtk_radiobox.o: $(srcdir)/src/gtk/radiobox.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/radiobox.cpp
+
+coredll_gtk_radiobut.o: $(srcdir)/src/gtk/radiobut.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/radiobut.cpp
+
+coredll_gtk_scrolbar.o: $(srcdir)/src/gtk/scrolbar.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/scrolbar.cpp
+
+coredll_gtk_scrolwin.o: $(srcdir)/src/gtk/scrolwin.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/scrolwin.cpp
+
+coredll_gtk_slider.o: $(srcdir)/src/gtk/slider.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/slider.cpp
+
+coredll_gtk_spinbutt.o: $(srcdir)/src/gtk/spinbutt.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/spinbutt.cpp
+
+coredll_gtk_spinctrl.o: $(srcdir)/src/gtk/spinctrl.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/spinctrl.cpp
+
+coredll_gtk_statbmp.o: $(srcdir)/src/gtk/statbmp.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/statbmp.cpp
+
+coredll_gtk_statbox.o: $(srcdir)/src/gtk/statbox.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/statbox.cpp
+
+coredll_gtk_statline.o: $(srcdir)/src/gtk/statline.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/statline.cpp
+
+coredll_gtk_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/stattext.cpp
+
+coredll_gtk_toolbar.o: $(srcdir)/src/gtk/toolbar.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/toolbar.cpp
+
+coredll_gtk_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/textctrl.cpp
+
+coredll_gtk_textentry.o: $(srcdir)/src/gtk/textentry.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/textentry.cpp
+
+coredll_gtk_tglbtn.o: $(srcdir)/src/gtk/tglbtn.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/tglbtn.cpp
+
+coredll_treeentry_gtk.o: $(srcdir)/src/gtk/treeentry_gtk.c $(COREDLL_ODEP)
+       $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/gtk/treeentry_gtk.c
+
+coredll_gtk1_bmpbuttn.o: $(srcdir)/src/gtk1/bmpbuttn.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/bmpbuttn.cpp
+
+coredll_gtk1_button.o: $(srcdir)/src/gtk1/button.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/button.cpp
+
+coredll_gtk1_checkbox.o: $(srcdir)/src/gtk1/checkbox.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/checkbox.cpp
+
+coredll_gtk1_checklst.o: $(srcdir)/src/gtk1/checklst.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/checklst.cpp
+
+coredll_gtk1_choice.o: $(srcdir)/src/gtk1/choice.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/choice.cpp
+
+coredll_gtk1_combobox.o: $(srcdir)/src/gtk1/combobox.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/combobox.cpp
+
+coredll_gtk1_control.o: $(srcdir)/src/gtk1/control.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/control.cpp
+
+coredll_gtk1_dialog.o: $(srcdir)/src/gtk1/dialog.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/dialog.cpp
+
+coredll_gtk1_filedlg.o: $(srcdir)/src/gtk1/filedlg.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/filedlg.cpp
+
+coredll_gtk1_fontdlg.o: $(srcdir)/src/gtk1/fontdlg.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/fontdlg.cpp
+
+coredll_gtk1_frame.o: $(srcdir)/src/gtk1/frame.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/frame.cpp
+
+coredll_gtk1_gauge.o: $(srcdir)/src/gtk1/gauge.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/gauge.cpp
+
+coredll_gtk1_listbox.o: $(srcdir)/src/gtk1/listbox.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/listbox.cpp
+
+coredll_gtk1_mdi.o: $(srcdir)/src/gtk1/mdi.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/mdi.cpp
+
+coredll_gtk1_menu.o: $(srcdir)/src/gtk1/menu.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/menu.cpp
+
+coredll_gtk1_mnemonics.o: $(srcdir)/src/gtk1/mnemonics.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/mnemonics.cpp
+
+coredll_gtk1_notebook.o: $(srcdir)/src/gtk1/notebook.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/notebook.cpp
+
+coredll_gtk1_radiobox.o: $(srcdir)/src/gtk1/radiobox.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/radiobox.cpp
+
+coredll_gtk1_radiobut.o: $(srcdir)/src/gtk1/radiobut.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/radiobut.cpp
+
+coredll_gtk1_scrolbar.o: $(srcdir)/src/gtk1/scrolbar.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/scrolbar.cpp
+
+coredll_gtk1_scrolwin.o: $(srcdir)/src/gtk1/scrolwin.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/scrolwin.cpp
+
+coredll_gtk1_slider.o: $(srcdir)/src/gtk1/slider.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/slider.cpp
+
+coredll_gtk1_spinbutt.o: $(srcdir)/src/gtk1/spinbutt.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/spinbutt.cpp
+
+coredll_gtk1_spinctrl.o: $(srcdir)/src/gtk1/spinctrl.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/spinctrl.cpp
+
+coredll_gtk1_statbmp.o: $(srcdir)/src/gtk1/statbmp.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/statbmp.cpp
+
+coredll_gtk1_statbox.o: $(srcdir)/src/gtk1/statbox.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/statbox.cpp
+
+coredll_gtk1_statline.o: $(srcdir)/src/gtk1/statline.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/statline.cpp
+
+coredll_gtk1_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp
+
+coredll_gtk1_toolbar.o: $(srcdir)/src/gtk1/toolbar.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/toolbar.cpp
+
+coredll_gtk1_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp
+
+coredll_gtk1_tglbtn.o: $(srcdir)/src/gtk1/tglbtn.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/tglbtn.cpp
+
+coredll_motif_accel.o: $(srcdir)/src/motif/accel.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/accel.cpp
+
+coredll_motif_app.o: $(srcdir)/src/motif/app.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/app.cpp
+
+coredll_motif_bmpbuttn.o: $(srcdir)/src/motif/bmpbuttn.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/bmpbuttn.cpp
+
+coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/bmpmotif.cpp
+
+coredll_motif_button.o: $(srcdir)/src/motif/button.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/button.cpp
+
+coredll_motif_checkbox.o: $(srcdir)/src/motif/checkbox.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/checkbox.cpp
+
+coredll_motif_checklst.o: $(srcdir)/src/motif/checklst.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/checklst.cpp
+
+coredll_motif_choice.o: $(srcdir)/src/motif/choice.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/choice.cpp
+
+coredll_motif_clipbrd.o: $(srcdir)/src/motif/clipbrd.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/clipbrd.cpp
+
+coredll_motif_colour.o: $(srcdir)/src/motif/colour.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/colour.cpp
+
+coredll_motif_combobox.o: $(srcdir)/src/motif/combobox.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/combobox.cpp
+
+coredll_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/combobox_native.cpp
+
+coredll_motif_control.o: $(srcdir)/src/motif/control.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/control.cpp
+
+coredll_motif_cursor.o: $(srcdir)/src/motif/cursor.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/cursor.cpp
+
+coredll_motif_data.o: $(srcdir)/src/motif/data.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/data.cpp
+
+coredll_motif_dataobj.o: $(srcdir)/src/motif/dataobj.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dataobj.cpp
+
+coredll_motif_dc.o: $(srcdir)/src/motif/dc.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dc.cpp
+
+coredll_motif_dcclient.o: $(srcdir)/src/motif/dcclient.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dcclient.cpp
+
+coredll_motif_dcmemory.o: $(srcdir)/src/motif/dcmemory.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dcmemory.cpp
+
+coredll_motif_dcscreen.o: $(srcdir)/src/motif/dcscreen.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dcscreen.cpp
+
+coredll_motif_dialog.o: $(srcdir)/src/motif/dialog.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dialog.cpp
+
+coredll_motif_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/evtloop.cpp
+
+coredll_motif_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/filedlg.cpp
+
+coredll_motif_font.o: $(srcdir)/src/motif/font.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/font.cpp
+
+coredll_motif_frame.o: $(srcdir)/src/motif/frame.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/frame.cpp
+
+coredll_motif_gauge.o: $(srcdir)/src/motif/gauge.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp
+
+coredll_sockmot.o: $(srcdir)/src/motif/sockmot.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/sockmot.cpp
+
+coredll_motif_icon.o: $(srcdir)/src/motif/icon.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/icon.cpp
+
+coredll_motif_listbox.o: $(srcdir)/src/motif/listbox.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/listbox.cpp
+
+coredll_motif_main.o: $(srcdir)/src/motif/main.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/main.cpp
+
+coredll_motif_menu.o: $(srcdir)/src/motif/menu.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/menu.cpp
+
+coredll_motif_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/menuitem.cpp
+
+coredll_motif_minifram.o: $(srcdir)/src/motif/minifram.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/minifram.cpp
+
+coredll_motif_msgdlg.o: $(srcdir)/src/motif/msgdlg.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/msgdlg.cpp
+
+coredll_motif_popupwin.o: $(srcdir)/src/motif/popupwin.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/popupwin.cpp
+
+coredll_motif_radiobox.o: $(srcdir)/src/motif/radiobox.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/radiobox.cpp
+
+coredll_motif_radiobut.o: $(srcdir)/src/motif/radiobut.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/radiobut.cpp
+
+coredll_motif_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/scrolbar.cpp
+
+coredll_motif_settings.o: $(srcdir)/src/motif/settings.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/settings.cpp
+
+coredll_motif_slider.o: $(srcdir)/src/motif/slider.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/slider.cpp
+
+coredll_motif_spinbutt.o: $(srcdir)/src/motif/spinbutt.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/spinbutt.cpp
+
+coredll_motif_statbmp.o: $(srcdir)/src/motif/statbmp.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/statbmp.cpp
+
+coredll_motif_statbox.o: $(srcdir)/src/motif/statbox.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/statbox.cpp
+
+coredll_motif_stattext.o: $(srcdir)/src/motif/stattext.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/stattext.cpp
+
+coredll_motif_textctrl.o: $(srcdir)/src/motif/textctrl.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/textctrl.cpp
  
  
-coredll_mnemonics.o: $(srcdir)/src/gtk/mnemonics.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/mnemonics.cpp
+coredll_motif_textentry.o: $(srcdir)/src/motif/textentry.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/textentry.cpp
  
  
-coredll_treeentry_gtk.o: $(srcdir)/src/gtk/treeentry_gtk.c $(COREDLL_ODEP)
-       $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/gtk/treeentry_gtk.c
+coredll_motif_timer.o: $(srcdir)/src/motif/timer.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/timer.cpp
  
  
-coredll_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/bmpmotif.cpp
+coredll_motif_toolbar.o: $(srcdir)/src/motif/toolbar.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/toolbar.cpp
  
  
-coredll_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/combobox_native.cpp
+coredll_motif_toplevel.o: $(srcdir)/src/motif/toplevel.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/toplevel.cpp
+
+coredll_motif_utils.o: $(srcdir)/src/motif/utils.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/utils.cpp
  
  
-coredll_gsockmot.o: $(srcdir)/src/motif/gsockmot.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/gsockmot.cpp
+coredll_motif_window.o: $(srcdir)/src/motif/window.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/window.cpp
  
  coredll_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(COREDLL_ODEP)
         $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/motif/xmcombo/xmcombo.c
  
  
  coredll_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(COREDLL_ODEP)
         $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/motif/xmcombo/xmcombo.c
  
+coredll_generic_notebook.o: $(srcdir)/src/generic/notebook.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/notebook.cpp
+
+coredll_generic_statline.o: $(srcdir)/src/generic/statline.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statline.cpp
+
+coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
+
+coredll_msw_checklst.o: $(srcdir)/src/msw/checklst.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp
+
+coredll_msw_fdrepdlg.o: $(srcdir)/src/msw/fdrepdlg.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/fdrepdlg.cpp
+
+coredll_msw_fontdlg.o: $(srcdir)/src/msw/fontdlg.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/fontdlg.cpp
+
+coredll_wince_checklst.o: $(srcdir)/src/msw/wince/checklst.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/wince/checklst.cpp
+
  coredll_choicece.o: $(srcdir)/src/msw/wince/choicece.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/wince/choicece.cpp
  
  coredll_choicece.o: $(srcdir)/src/msw/wince/choicece.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/wince/choicece.cpp
  
@@ -24162,1244 +27872,1268 @@ coredll_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(COREDLL_ODEP)
  coredll_textctrlce.o: $(srcdir)/src/msw/wince/textctrlce.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/wince/textctrlce.cpp
  
  coredll_textctrlce.o: $(srcdir)/src/msw/wince/textctrlce.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/wince/textctrlce.cpp
  
-coredll_listctrl_mac.o: $(srcdir)/src/osx/carbon/listctrl_mac.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/listctrl_mac.cpp
+coredll_carbon_anybutton.o: $(srcdir)/src/osx/carbon/anybutton.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/anybutton.cpp
  
  
-coredll_notebmac.o: $(srcdir)/src/osx/carbon/notebmac.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/notebmac.cpp
+coredll_carbon_bmpbuttn.o: $(srcdir)/src/osx/carbon/bmpbuttn.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/bmpbuttn.cpp
  
  
-coredll_statlmac.o: $(srcdir)/src/osx/carbon/statlmac.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statlmac.cpp
+coredll_carbon_button.o: $(srcdir)/src/osx/carbon/button.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/button.cpp
  
  
-coredll_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm
+coredll_carbon_checkbox.o: $(srcdir)/src/osx/carbon/checkbox.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/checkbox.cpp
  
  
-coredll_glcanvas.o: $(srcdir)/src/osx/cocoa/glcanvas.mm $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/glcanvas.mm
+coredll_carbon_choice.o: $(srcdir)/src/osx/carbon/choice.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/choice.cpp
  
  
-coredll_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSBox.mm
+coredll_carbon_colordlg.o: $(srcdir)/src/osx/carbon/colordlg.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlg.cpp
  
  
-coredll_NSButton.o: $(srcdir)/src/cocoa/NSButton.mm $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSButton.mm
+coredll_carbon_dialog.o: $(srcdir)/src/osx/carbon/dialog.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dialog.cpp
  
  
-coredll_NSControl.o: $(srcdir)/src/cocoa/NSControl.mm $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSControl.mm
+coredll_carbon_dirdlg.o: $(srcdir)/src/osx/carbon/dirdlg.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dirdlg.cpp
  
  
-coredll_NSMenu.o: $(srcdir)/src/cocoa/NSMenu.mm $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSMenu.mm
+coredll_carbon_dnd.o: $(srcdir)/src/osx/carbon/dnd.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dnd.cpp
  
  
-coredll_NSPanel.o: $(srcdir)/src/cocoa/NSPanel.mm $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSPanel.mm
+coredll_carbon_evtloop.o: $(srcdir)/src/osx/carbon/evtloop.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/evtloop.cpp
  
  
-coredll_NSScroller.o: $(srcdir)/src/cocoa/NSScroller.mm $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSScroller.mm
+coredll_carbon_filedlg.o: $(srcdir)/src/osx/carbon/filedlg.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/filedlg.cpp
  
  
-coredll_NSSlider.o: $(srcdir)/src/cocoa/NSSlider.mm $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSSlider.mm
+coredll_carbon_gauge.o: $(srcdir)/src/osx/carbon/gauge.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gauge.cpp
  
  
-coredll_NSTabView.o: $(srcdir)/src/cocoa/NSTabView.mm $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSTabView.mm
+coredll_carbon_listbox.o: $(srcdir)/src/osx/carbon/listbox.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/listbox.cpp
  
  
-coredll_NSTableView.o: $(srcdir)/src/cocoa/NSTableView.mm $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSTableView.mm
+coredll_listctrl_mac.o: $(srcdir)/src/osx/carbon/listctrl_mac.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/listctrl_mac.cpp
  
  
-coredll_NSTextField.o: $(srcdir)/src/cocoa/NSTextField.mm $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSTextField.mm
+coredll_carbon_menu.o: $(srcdir)/src/osx/carbon/menu.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/menu.cpp
  
  
-coredll_NSView.o: $(srcdir)/src/cocoa/NSView.mm $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSView.mm
+coredll_carbon_menuitem.o: $(srcdir)/src/osx/carbon/menuitem.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/menuitem.cpp
  
  
-coredll_NSWindow.o: $(srcdir)/src/cocoa/NSWindow.mm $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/NSWindow.mm
+coredll_carbon_msgdlg.o: $(srcdir)/src/osx/carbon/msgdlg.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/msgdlg.cpp
  
  
-coredll_ObjcRef.o: $(srcdir)/src/cocoa/ObjcRef.mm $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/ObjcRef.mm
+coredll_carbon_nonownedwnd.o: $(srcdir)/src/osx/carbon/nonownedwnd.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/nonownedwnd.cpp
  
  
-coredll_drawer.o: $(srcdir)/src/cocoa/drawer.mm $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/drawer.mm
+coredll_notebmac.o: $(srcdir)/src/osx/carbon/notebmac.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/notebmac.cpp
  
  
-coredll_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/mbarman.mm
+coredll_carbon_printdlg.o: $(srcdir)/src/osx/carbon/printdlg.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/printdlg.cpp
  
  
-coredll_sound.o: $(srcdir)/src/cocoa/sound.mm $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/sound.mm
+coredll_carbon_radiobut.o: $(srcdir)/src/osx/carbon/radiobut.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/radiobut.cpp
  
  
-coredll_statline2.o: $(srcdir)/src/cocoa/statline2.mm $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/statline2.mm
+coredll_carbon_scrolbar.o: $(srcdir)/src/osx/carbon/scrolbar.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/scrolbar.cpp
  
  
-coredll_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.mm $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/utilsexc.mm
+coredll_carbon_slider.o: $(srcdir)/src/osx/carbon/slider.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/slider.cpp
  
  
-coredll_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/gsockpm.cpp
+coredll_carbon_spinbutt.o: $(srcdir)/src/osx/carbon/spinbutt.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/spinbutt.cpp
  
  
-coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/ctrlrend.cpp
+coredll_carbon_srchctrl.o: $(srcdir)/src/osx/carbon/srchctrl.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/srchctrl.cpp
  
  
-coredll_framuniv.o: $(srcdir)/src/univ/framuniv.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/framuniv.cpp
+coredll_carbon_statbmp.o: $(srcdir)/src/osx/carbon/statbmp.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbmp.cpp
  
  
-coredll_inpcons.o: $(srcdir)/src/univ/inpcons.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/inpcons.cpp
+coredll_carbon_statbox.o: $(srcdir)/src/osx/carbon/statbox.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbox.cpp
  
  
-coredll_inphand.o: $(srcdir)/src/univ/inphand.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/inphand.cpp
+coredll_statlmac.o: $(srcdir)/src/osx/carbon/statlmac.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statlmac.cpp
  
  
-coredll_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/scrarrow.cpp
+coredll_carbon_stattext.o: $(srcdir)/src/osx/carbon/stattext.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/stattext.cpp
  
  
-coredll_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/scrthumb.cpp
+coredll_carbon_textctrl.o: $(srcdir)/src/osx/carbon/textctrl.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/textctrl.cpp
  
  
-coredll_settingsuniv.o: $(srcdir)/src/univ/settingsuniv.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/settingsuniv.cpp
+coredll_carbon_tglbtn.o: $(srcdir)/src/osx/carbon/tglbtn.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tglbtn.cpp
  
  
-coredll_stdrend.o: $(srcdir)/src/univ/stdrend.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/stdrend.cpp
+coredll_carbon_toolbar.o: $(srcdir)/src/osx/carbon/toolbar.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/toolbar.cpp
  
  
-coredll_theme.o: $(srcdir)/src/univ/theme.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/theme.cpp
+coredll_carbon_tooltip.o: $(srcdir)/src/osx/carbon/tooltip.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tooltip.cpp
  
  
-coredll_topluniv.o: $(srcdir)/src/univ/topluniv.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/topluniv.cpp
+coredll_carbon_window.o: $(srcdir)/src/osx/carbon/window.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/window.cpp
  
  
-coredll_winuniv.o: $(srcdir)/src/univ/winuniv.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/winuniv.cpp
+coredll_cocoa_anybutton.o: $(srcdir)/src/osx/cocoa/anybutton.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/anybutton.mm
  
  
-coredll_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/themes/gtk.cpp
+coredll_osx_cocoa_button.o: $(srcdir)/src/osx/cocoa/button.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/button.mm
  
  
-coredll_metal.o: $(srcdir)/src/univ/themes/metal.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/themes/metal.cpp
+coredll_osx_cocoa_checkbox.o: $(srcdir)/src/osx/cocoa/checkbox.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/checkbox.mm
  
  
-coredll_mono.o: $(srcdir)/src/univ/themes/mono.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/themes/mono.cpp
+coredll_osx_cocoa_choice.o: $(srcdir)/src/osx/cocoa/choice.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/choice.mm
  
  
-coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/themes/win32.cpp
+coredll_osx_cocoa_colour.o: $(srcdir)/src/osx/cocoa/colour.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/colour.mm
  
  
-@COND_PLATFORM_WIN32_1@coredll_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
+coredll_osx_cocoa_combobox.o: $(srcdir)/src/osx/cocoa/combobox.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/combobox.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/evtloop.cpp
+coredll_osx_cocoa_dialog.o: $(srcdir)/src/osx/cocoa/dialog.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dialog.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/gtk1/evtloop.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/evtloop.cpp
+coredll_osx_cocoa_dirdlg.o: $(srcdir)/src/osx/cocoa/dirdlg.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dirdlg.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/x11/evtloop.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/evtloop.cpp
+coredll_cocoa_dnd.o: $(srcdir)/src/osx/cocoa/dnd.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dnd.mm
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/evtloop.cpp
+coredll_osx_cocoa_evtloop.o: $(srcdir)/src/osx/cocoa/evtloop.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/evtloop.mm
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/dfb/evtloop.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/evtloop.cpp
+coredll_osx_cocoa_filedlg.o: $(srcdir)/src/osx/cocoa/filedlg.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/filedlg.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/evtloop.cpp
+coredll_osx_cocoa_gauge.o: $(srcdir)/src/osx/cocoa/gauge.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/gauge.mm
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_evtloop.o: $(srcdir)/src/osx/carbon/evtloop.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/evtloop.cpp
+coredll_osx_cocoa_listbox.o: $(srcdir)/src/osx/cocoa/listbox.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/listbox.mm
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_evtloop.o: $(srcdir)/src/osx/cocoa/evtloop.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/evtloop.mm
+coredll_osx_cocoa_menu.o: $(srcdir)/src/osx/cocoa/menu.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/menu.mm
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/evtloop.mm
+coredll_osx_cocoa_menuitem.o: $(srcdir)/src/osx/cocoa/menuitem.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/menuitem.mm
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_evtloop.o: $(srcdir)/src/os2/evtloop.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/evtloop.cpp
+coredll_osx_cocoa_msgdlg.o: $(srcdir)/src/osx/cocoa/msgdlg.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/msgdlg.mm
  
  
-@COND_PLATFORM_WIN32_1@coredll_main.o: $(srcdir)/src/msw/main.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/main.cpp
+coredll_cocoa_nonownedwnd.o: $(srcdir)/src/osx/cocoa/nonownedwnd.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/nonownedwnd.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_main.o: $(srcdir)/src/gtk1/main.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/main.cpp
+coredll_osx_cocoa_notebook.o: $(srcdir)/src/osx/cocoa/notebook.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/notebook.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_main.o: $(srcdir)/src/motif/main.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/main.cpp
+coredll_osx_cocoa_radiobut.o: $(srcdir)/src/osx/cocoa/radiobut.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/radiobut.mm
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_main.o: $(srcdir)/src/cocoa/main.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/main.cpp
+coredll_cocoa_printdlg.o: $(srcdir)/src/osx/cocoa/printdlg.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/printdlg.mm
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_main.o: $(srcdir)/src/os2/main.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/main.cpp
+coredll_osx_cocoa_scrolbar.o: $(srcdir)/src/osx/cocoa/scrolbar.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/scrolbar.mm
  
  
-@COND_TOOLKIT_OSX_CARBON@coredll_utils.o: $(srcdir)/src/osx/carbon/utils.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/utils.cpp
+coredll_osx_cocoa_slider.o: $(srcdir)/src/osx/cocoa/slider.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/slider.mm
  
  
-@COND_TOOLKIT_OSX_COCOA@coredll_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm
+coredll_osx_cocoa_spinbutt.o: $(srcdir)/src/osx/cocoa/spinbutt.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/spinbutt.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_utils.o: $(srcdir)/src/x11/utils.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/utils.cpp
+coredll_cocoa_srchctrl.o: $(srcdir)/src/osx/cocoa/srchctrl.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/srchctrl.mm
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_utils.o: $(srcdir)/src/mgl/utils.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/utils.cpp
+coredll_osx_cocoa_statbox.o: $(srcdir)/src/osx/cocoa/statbox.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/statbox.mm
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_utils.o: $(srcdir)/src/dfb/utils.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/utils.cpp
+coredll_cocoa_statline.o: $(srcdir)/src/osx/cocoa/statline.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/statline.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_utils.o: $(srcdir)/src/motif/utils.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/utils.cpp
+coredll_osx_cocoa_stattext.o: $(srcdir)/src/osx/cocoa/stattext.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/stattext.mm
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_utils.o: $(srcdir)/src/cocoa/utils.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/utils.mm
+coredll_osx_cocoa_textctrl.o: $(srcdir)/src/osx/cocoa/textctrl.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/textctrl.mm
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+coredll_cocoa_tglbtn.o: $(srcdir)/src/osx/cocoa/tglbtn.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/tglbtn.mm
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+coredll_osx_cocoa_toolbar.o: $(srcdir)/src/osx/cocoa/toolbar.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/toolbar.mm
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+coredll_osx_cocoa_tooltip.o: $(srcdir)/src/osx/cocoa/tooltip.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/tooltip.mm
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+coredll_osx_cocoa_window.o: $(srcdir)/src/osx/cocoa/window.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/window.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+coredll_iphone_anybutton.o: $(srcdir)/src/osx/iphone/anybutton.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/anybutton.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+coredll_iphone_button.o: $(srcdir)/src/osx/iphone/button.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/button.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+coredll_iphone_checkbox.o: $(srcdir)/src/osx/iphone/checkbox.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/checkbox.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+coredll_iphone_dialog.o: $(srcdir)/src/osx/iphone/dialog.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/dialog.mm
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+coredll_iphone_evtloop.o: $(srcdir)/src/osx/iphone/evtloop.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/evtloop.mm
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+coredll_iphone_gauge.o: $(srcdir)/src/osx/iphone/gauge.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/gauge.mm
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_caret.o: $(srcdir)/src/msw/caret.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
+coredll_iphone_msgdlg.o: $(srcdir)/src/osx/iphone/msgdlg.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/msgdlg.mm
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_caret.o: $(srcdir)/src/msw/caret.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
+coredll_iphone_nonownedwnd.o: $(srcdir)/src/osx/iphone/nonownedwnd.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/nonownedwnd.mm
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+coredll_iphone_scrolbar.o: $(srcdir)/src/osx/iphone/scrolbar.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/scrolbar.mm
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+coredll_iphone_slider.o: $(srcdir)/src/osx/iphone/slider.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/slider.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+coredll_iphone_stattext.o: $(srcdir)/src/osx/iphone/stattext.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/stattext.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+coredll_iphone_textctrl.o: $(srcdir)/src/osx/iphone/textctrl.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/textctrl.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+coredll_iphone_toolbar.o: $(srcdir)/src/osx/iphone/toolbar.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/toolbar.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+coredll_iphone_utils.o: $(srcdir)/src/osx/iphone/utils.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/utils.mm
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+coredll_iphone_window.o: $(srcdir)/src/osx/iphone/window.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/window.mm
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+coredll_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSBox.mm
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
+coredll_NSButton.o: $(srcdir)/src/cocoa/NSButton.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSButton.mm
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
+coredll_NSControl.o: $(srcdir)/src/cocoa/NSControl.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSControl.mm
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
+coredll_NSMenu.o: $(srcdir)/src/cocoa/NSMenu.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSMenu.mm
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
+coredll_NSPanel.o: $(srcdir)/src/cocoa/NSPanel.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSPanel.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+coredll_NSScroller.o: $(srcdir)/src/cocoa/NSScroller.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSScroller.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+coredll_NSSlider.o: $(srcdir)/src/cocoa/NSSlider.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSSlider.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+coredll_NSTabView.o: $(srcdir)/src/cocoa/NSTabView.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSTabView.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+coredll_NSTableView.o: $(srcdir)/src/cocoa/NSTableView.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSTableView.mm
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_dialup.o: $(srcdir)/src/msw/dialup.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
+coredll_NSTextField.o: $(srcdir)/src/cocoa/NSTextField.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSTextField.mm
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_dialup.o: $(srcdir)/src/msw/dialup.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
+coredll_NSView.o: $(srcdir)/src/cocoa/NSView.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSView.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
+coredll_NSWindow.o: $(srcdir)/src/cocoa/NSWindow.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSWindow.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
+coredll_ObjcRef.o: $(srcdir)/src/cocoa/ObjcRef.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/ObjcRef.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
+coredll_cocoa_app.o: $(srcdir)/src/cocoa/app.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/app.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
+coredll_cocoa_bitmap.o: $(srcdir)/src/cocoa/bitmap.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/bitmap.mm
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
+coredll_cocoa_bmpbuttn.o: $(srcdir)/src/cocoa/bmpbuttn.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/bmpbuttn.mm
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
+coredll_cocoa_brush.o: $(srcdir)/src/cocoa/brush.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/brush.mm
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
+coredll_src_cocoa_button.o: $(srcdir)/src/cocoa/button.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/button.mm
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
+coredll_src_cocoa_checkbox.o: $(srcdir)/src/cocoa/checkbox.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/checkbox.mm
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_fontenum.o: $(srcdir)/src/mgl/fontenum.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/fontenum.cpp
+coredll_cocoa_checklst.o: $(srcdir)/src/cocoa/checklst.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/checklst.mm
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_fontenum.o: $(srcdir)/src/dfb/fontenum.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/fontenum.cpp
+coredll_src_cocoa_choice.o: $(srcdir)/src/cocoa/choice.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/choice.mm
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontenum.o: $(srcdir)/src/cocoa/fontenum.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/fontenum.mm
+coredll_cocoa_clipbrd.o: $(srcdir)/src/cocoa/clipbrd.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/clipbrd.mm
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_fontenum.o: $(srcdir)/src/os2/fontenum.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/fontenum.cpp
+coredll_cocoa_colordlg.o: $(srcdir)/src/cocoa/colordlg.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/colordlg.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
+coredll_src_cocoa_colour.o: $(srcdir)/src/cocoa/colour.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/colour.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
+coredll_src_cocoa_combobox.o: $(srcdir)/src/cocoa/combobox.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/combobox.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
+coredll_cocoa_control.o: $(srcdir)/src/cocoa/control.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/control.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
+coredll_cocoa_cursor.o: $(srcdir)/src/cocoa/cursor.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/cursor.mm
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
+coredll_cocoa_data.o: $(srcdir)/src/cocoa/data.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/data.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
+coredll_cocoa_dataobj.o: $(srcdir)/src/cocoa/dataobj.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/dataobj.mm
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
+coredll_cocoa_dc.o: $(srcdir)/src/cocoa/dc.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/dc.mm
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
+coredll_cocoa_dcclient.o: $(srcdir)/src/cocoa/dcclient.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/dcclient.mm
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_fontutil.o: $(srcdir)/src/mgl/fontutil.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/fontutil.cpp
+coredll_cocoa_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/dcmemory.mm
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontutil.o: $(srcdir)/src/cocoa/fontutil.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/fontutil.cpp
+coredll_cocoa_dcscreen.o: $(srcdir)/src/cocoa/dcscreen.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/dcscreen.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_fontutil.o: $(srcdir)/src/os2/fontutil.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/fontutil.cpp
+coredll_src_cocoa_dialog.o: $(srcdir)/src/cocoa/dialog.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/dialog.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
+coredll_src_cocoa_dirdlg.o: $(srcdir)/src/cocoa/dirdlg.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/dirdlg.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
+coredll_cocoa_display.o: $(srcdir)/src/cocoa/display.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/display.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
+coredll_drawer.o: $(srcdir)/src/cocoa/drawer.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/drawer.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
+coredll_src_cocoa_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/evtloop.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+coredll_src_cocoa_filedlg.o: $(srcdir)/src/cocoa/filedlg.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/filedlg.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+coredll_cocoa_font.o: $(srcdir)/src/cocoa/font.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/font.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+coredll_cocoa_fontdlg.o: $(srcdir)/src/cocoa/fontdlg.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/fontdlg.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+coredll_cocoa_fontenum.o: $(srcdir)/src/cocoa/fontenum.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/fontenum.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+coredll_cocoa_fontutil.o: $(srcdir)/src/cocoa/fontutil.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/fontutil.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+coredll_cocoa_frame.o: $(srcdir)/src/cocoa/frame.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/frame.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+coredll_src_cocoa_gauge.o: $(srcdir)/src/cocoa/gauge.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/gauge.mm
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+coredll_cocoa_icon.o: $(srcdir)/src/cocoa/icon.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/icon.mm
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+coredll_src_cocoa_listbox.o: $(srcdir)/src/cocoa/listbox.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/listbox.mm
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_icon.o: $(srcdir)/src/msw/icon.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
+coredll_cocoa_main.o: $(srcdir)/src/cocoa/main.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/main.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_icon.o: $(srcdir)/src/msw/icon.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
+coredll_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/mbarman.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_icon.o: $(srcdir)/src/motif/icon.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/icon.cpp
+coredll_cocoa_mdi.o: $(srcdir)/src/cocoa/mdi.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/mdi.mm
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
+coredll_src_cocoa_menu.o: $(srcdir)/src/cocoa/menu.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/menu.mm
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
+coredll_src_cocoa_menuitem.o: $(srcdir)/src/cocoa/menuitem.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/menuitem.mm
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_icon.o: $(srcdir)/src/cocoa/icon.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/icon.mm
+coredll_src_cocoa_msgdlg.o: $(srcdir)/src/cocoa/msgdlg.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/msgdlg.mm
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_icon.o: $(srcdir)/src/os2/icon.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/icon.cpp
+coredll_src_cocoa_notebook.o: $(srcdir)/src/cocoa/notebook.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/notebook.mm
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
+coredll_cocoa_pen.o: $(srcdir)/src/cocoa/pen.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/pen.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
+coredll_cocoa_radiobox.o: $(srcdir)/src/cocoa/radiobox.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/radiobox.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
+coredll_src_cocoa_radiobut.o: $(srcdir)/src/cocoa/radiobut.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/radiobut.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_app.o: $(srcdir)/src/gtk/app.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/app.cpp
+coredll_cocoa_region.o: $(srcdir)/src/cocoa/region.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/region.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_app.o: $(srcdir)/src/gtk1/app.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/app.cpp
+coredll_src_cocoa_scrolbar.o: $(srcdir)/src/cocoa/scrolbar.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/scrolbar.mm
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_app.o: $(srcdir)/src/msw/app.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/app.cpp
+coredll_cocoa_settings.o: $(srcdir)/src/cocoa/settings.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/settings.mm
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_app.o: $(srcdir)/src/msw/app.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/app.cpp
+coredll_src_cocoa_slider.o: $(srcdir)/src/cocoa/slider.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/slider.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_app.o: $(srcdir)/src/x11/app.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/app.cpp
+coredll_sound.o: $(srcdir)/src/cocoa/sound.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/sound.mm
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_app.o: $(srcdir)/src/mgl/app.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/app.cpp
+coredll_src_cocoa_spinbutt.o: $(srcdir)/src/cocoa/spinbutt.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/spinbutt.mm
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_app.o: $(srcdir)/src/dfb/app.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/app.cpp
+coredll_cocoa_statbmp.o: $(srcdir)/src/cocoa/statbmp.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/statbmp.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_app.o: $(srcdir)/src/motif/app.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/app.cpp
+coredll_src_cocoa_statbox.o: $(srcdir)/src/cocoa/statbox.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/statbox.mm
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_app.o: $(srcdir)/src/osx/carbon/app.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
+coredll_statline2.o: $(srcdir)/src/cocoa/statline2.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/statline2.mm
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_app.o: $(srcdir)/src/osx/carbon/app.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
+coredll_src_cocoa_stattext.o: $(srcdir)/src/cocoa/stattext.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/stattext.mm
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_app.o: $(srcdir)/src/cocoa/app.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/app.mm
+coredll_src_cocoa_textctrl.o: $(srcdir)/src/cocoa/textctrl.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/textctrl.mm
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_app.o: $(srcdir)/src/os2/app.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/app.cpp
+coredll_cocoa_timer.o: $(srcdir)/src/cocoa/timer.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/timer.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.c $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.c
+coredll_src_cocoa_toolbar.o: $(srcdir)/src/cocoa/toolbar.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/toolbar.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/bitmap.cpp
+coredll_src_cocoa_tooltip.o: $(srcdir)/src/cocoa/tooltip.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/tooltip.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/gtk1/bitmap.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/bitmap.cpp
+coredll_cocoa_toplevel.o: $(srcdir)/src/cocoa/toplevel.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/toplevel.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
+coredll_src_cocoa_utils.o: $(srcdir)/src/cocoa/utils.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/utils.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
+coredll_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/utilsexc.mm
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
+coredll_src_cocoa_window.o: $(srcdir)/src/cocoa/window.mm $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/window.mm
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
+coredll_os2_accel.o: $(srcdir)/src/os2/accel.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/accel.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
+coredll_os2_app.o: $(srcdir)/src/os2/app.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/app.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
+coredll_os2_bitmap.o: $(srcdir)/src/os2/bitmap.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/bitmap.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/bitmap.cpp
+coredll_os2_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/bmpbuttn.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_bitmap.o: $(srcdir)/src/dfb/bitmap.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/bitmap.cpp
+coredll_os2_brush.o: $(srcdir)/src/os2/brush.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/brush.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_bitmap.o: $(srcdir)/src/cocoa/bitmap.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/bitmap.mm
+coredll_os2_button.o: $(srcdir)/src/os2/button.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/button.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_bitmap.o: $(srcdir)/src/os2/bitmap.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/bitmap.cpp
+coredll_os2_checkbox.o: $(srcdir)/src/os2/checkbox.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/checkbox.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_brush.o: $(srcdir)/src/gtk/brush.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/brush.cpp
+coredll_os2_checklst.o: $(srcdir)/src/os2/checklst.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/checklst.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_brush.o: $(srcdir)/src/gtk1/brush.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/brush.cpp
+coredll_os2_choice.o: $(srcdir)/src/os2/choice.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/choice.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_brush.o: $(srcdir)/src/x11/brush.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
+coredll_os2_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/clipbrd.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_brush.o: $(srcdir)/src/x11/brush.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
+coredll_os2_colour.o: $(srcdir)/src/os2/colour.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/colour.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_brush.o: $(srcdir)/src/msw/brush.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
+coredll_os2_combobox.o: $(srcdir)/src/os2/combobox.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/combobox.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_brush.o: $(srcdir)/src/msw/brush.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
+coredll_os2_control.o: $(srcdir)/src/os2/control.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/control.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_brush.o: $(srcdir)/src/osx/brush.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
+coredll_os2_cursor.o: $(srcdir)/src/os2/cursor.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/cursor.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_brush.o: $(srcdir)/src/osx/brush.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
+coredll_os2_data.o: $(srcdir)/src/os2/data.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/data.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_brush.o: $(srcdir)/src/mgl/brush.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/brush.cpp
+coredll_os2_dataobj.o: $(srcdir)/src/os2/dataobj.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dataobj.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_brush.o: $(srcdir)/src/dfb/brush.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/brush.cpp
+coredll_os2_dc.o: $(srcdir)/src/os2/dc.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dc.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_brush.o: $(srcdir)/src/cocoa/brush.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/brush.mm
+coredll_os2_dcclient.o: $(srcdir)/src/os2/dcclient.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dcclient.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_brush.o: $(srcdir)/src/os2/brush.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/brush.cpp
+coredll_os2_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dcmemory.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_clipbrd.o: $(srcdir)/src/gtk/clipbrd.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/clipbrd.cpp
+coredll_os2_dcprint.o: $(srcdir)/src/os2/dcprint.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dcprint.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_clipbrd.o: $(srcdir)/src/gtk1/clipbrd.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/clipbrd.cpp
+coredll_os2_dcscreen.o: $(srcdir)/src/os2/dcscreen.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dcscreen.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
+coredll_os2_dialog.o: $(srcdir)/src/os2/dialog.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dialog.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
+coredll_os2_dnd.o: $(srcdir)/src/os2/dnd.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dnd.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_clipbrd.o: $(srcdir)/src/x11/clipbrd.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/clipbrd.cpp
+coredll_os2_evtloop.o: $(srcdir)/src/os2/evtloop.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/evtloop.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_clipbrd.o: $(srcdir)/src/mgl/clipbrd.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/clipbrd.cpp
+coredll_os2_filedlg.o: $(srcdir)/src/os2/filedlg.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/filedlg.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_clipbrd.o: $(srcdir)/src/motif/clipbrd.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/clipbrd.cpp
+coredll_os2_font.o: $(srcdir)/src/os2/font.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/font.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
+coredll_os2_fontdlg.o: $(srcdir)/src/os2/fontdlg.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/fontdlg.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
+coredll_os2_fontenum.o: $(srcdir)/src/os2/fontenum.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/fontenum.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_clipbrd.o: $(srcdir)/src/cocoa/clipbrd.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/clipbrd.mm
+coredll_os2_fontutil.o: $(srcdir)/src/os2/fontutil.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/fontutil.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/clipbrd.cpp
+coredll_os2_frame.o: $(srcdir)/src/os2/frame.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/frame.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_colour.o: $(srcdir)/src/gtk/colour.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/colour.cpp
+coredll_os2_gauge.o: $(srcdir)/src/os2/gauge.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/gauge.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_colour.o: $(srcdir)/src/gtk1/colour.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/colour.cpp
+coredll_os2_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/gdiimage.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_colour.o: $(srcdir)/src/msw/colour.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
+coredll_sockpm.o: $(srcdir)/src/os2/sockpm.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/sockpm.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_colour.o: $(srcdir)/src/msw/colour.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
+coredll_os2_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/helpwin.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_colour.o: $(srcdir)/src/osx/core/colour.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
+coredll_os2_icon.o: $(srcdir)/src/os2/icon.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/icon.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_colour.o: $(srcdir)/src/osx/core/colour.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
+coredll_os2_iniconf.o: $(srcdir)/src/os2/iniconf.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/iniconf.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_colour.o: $(srcdir)/src/x11/colour.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/colour.cpp
+coredll_os2_listbox.o: $(srcdir)/src/os2/listbox.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/listbox.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_colour.o: $(srcdir)/src/generic/colour.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
+coredll_os2_main.o: $(srcdir)/src/os2/main.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/main.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_colour.o: $(srcdir)/src/generic/colour.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
+coredll_os2_menu.o: $(srcdir)/src/os2/menu.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/menu.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_colour.o: $(srcdir)/src/motif/colour.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/colour.cpp
+coredll_os2_menuitem.o: $(srcdir)/src/os2/menuitem.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/menuitem.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_colour.o: $(srcdir)/src/cocoa/colour.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/colour.mm
+coredll_os2_metafile.o: $(srcdir)/src/os2/metafile.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/metafile.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_colour.o: $(srcdir)/src/os2/colour.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/colour.cpp
+coredll_os2_minifram.o: $(srcdir)/src/os2/minifram.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/minifram.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_cursor.o: $(srcdir)/src/gtk/cursor.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/cursor.cpp
+coredll_os2_msgdlg.o: $(srcdir)/src/os2/msgdlg.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/msgdlg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_cursor.o: $(srcdir)/src/gtk1/cursor.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/cursor.cpp
+coredll_os2_nativdlg.o: $(srcdir)/src/os2/nativdlg.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/nativdlg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_cursor.o: $(srcdir)/src/msw/cursor.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
+coredll_os2_notebook.o: $(srcdir)/src/os2/notebook.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/notebook.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_cursor.o: $(srcdir)/src/msw/cursor.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
+coredll_os2_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/ownerdrw.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_cursor.o: $(srcdir)/src/x11/cursor.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/cursor.cpp
+coredll_os2_palette.o: $(srcdir)/src/os2/palette.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/palette.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_cursor.o: $(srcdir)/src/mgl/cursor.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/cursor.cpp
+coredll_os2_pen.o: $(srcdir)/src/os2/pen.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/pen.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_cursor.o: $(srcdir)/src/dfb/cursor.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/cursor.cpp
+coredll_os2_popupwin.o: $(srcdir)/src/os2/popupwin.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/popupwin.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_cursor.o: $(srcdir)/src/motif/cursor.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/cursor.cpp
+coredll_os2_print.o: $(srcdir)/src/os2/print.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/print.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
+coredll_os2_radiobox.o: $(srcdir)/src/os2/radiobox.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/radiobox.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
+coredll_os2_radiobut.o: $(srcdir)/src/os2/radiobut.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/radiobut.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_cursor.o: $(srcdir)/src/cocoa/cursor.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/cursor.mm
+coredll_os2_region.o: $(srcdir)/src/os2/region.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/region.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_cursor.o: $(srcdir)/src/os2/cursor.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/cursor.cpp
+coredll_os2_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/scrolbar.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_dataobj.o: $(srcdir)/src/gtk/dataobj.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dataobj.cpp
+coredll_os2_settings.o: $(srcdir)/src/os2/settings.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/settings.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_dataobj.o: $(srcdir)/src/gtk1/dataobj.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/dataobj.cpp
+coredll_os2_slider.o: $(srcdir)/src/os2/slider.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/slider.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
+coredll_os2_spinbutt.o: $(srcdir)/src/os2/spinbutt.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/spinbutt.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
+coredll_os2_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/spinctrl.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_dataobj.o: $(srcdir)/src/x11/dataobj.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/dataobj.cpp
+coredll_os2_statbmp.o: $(srcdir)/src/os2/statbmp.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/statbmp.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_dataobj.o: $(srcdir)/src/motif/dataobj.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dataobj.cpp
+coredll_os2_statbox.o: $(srcdir)/src/os2/statbox.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/statbox.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
+coredll_os2_statline.o: $(srcdir)/src/os2/statline.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/statline.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
+coredll_os2_stattext.o: $(srcdir)/src/os2/stattext.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/stattext.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_dataobj.o: $(srcdir)/src/cocoa/dataobj.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/dataobj.mm
+coredll_os2_textctrl.o: $(srcdir)/src/os2/textctrl.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/textctrl.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dataobj.o: $(srcdir)/src/os2/dataobj.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dataobj.cpp
+coredll_os2_textentry.o: $(srcdir)/src/os2/textentry.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/textentry.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_dc.o: $(srcdir)/src/gtk/dc.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dc.cpp
+coredll_os2_tglbtn.o: $(srcdir)/src/os2/tglbtn.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/tglbtn.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_dc.o: $(srcdir)/src/gtk1/dc.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/dc.cpp
+coredll_os2_timer.o: $(srcdir)/src/os2/timer.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/timer.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_dc.o: $(srcdir)/src/msw/dc.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
+coredll_os2_toolbar.o: $(srcdir)/src/os2/toolbar.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/toolbar.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_dc.o: $(srcdir)/src/msw/dc.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
+coredll_os2_tooltip.o: $(srcdir)/src/os2/tooltip.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/tooltip.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_dc.o: $(srcdir)/src/x11/dc.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/dc.cpp
+coredll_os2_toplevel.o: $(srcdir)/src/os2/toplevel.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/toplevel.cpp
+
+coredll_os2_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/utilsgui.cpp
+
+coredll_os2_window.o: $(srcdir)/src/os2/window.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/window.cpp
+
+coredll_univ_bmpbuttn.o: $(srcdir)/src/univ/bmpbuttn.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/bmpbuttn.cpp
+
+coredll_univ_button.o: $(srcdir)/src/univ/button.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/button.cpp
+
+coredll_univ_checkbox.o: $(srcdir)/src/univ/checkbox.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/checkbox.cpp
+
+coredll_univ_checklst.o: $(srcdir)/src/univ/checklst.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/checklst.cpp
+
+coredll_univ_choice.o: $(srcdir)/src/univ/choice.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/choice.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_dc.o: $(srcdir)/src/mgl/dc.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/dc.cpp
+coredll_univ_combobox.o: $(srcdir)/src/univ/combobox.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/combobox.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dc.o: $(srcdir)/src/dfb/dc.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/dc.cpp
+coredll_univ_control.o: $(srcdir)/src/univ/control.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/control.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_dc.o: $(srcdir)/src/motif/dc.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dc.cpp
+coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/ctrlrend.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_dc.o: $(srcdir)/src/cocoa/dc.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/dc.mm
+coredll_univ_dialog.o: $(srcdir)/src/univ/dialog.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/dialog.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dc.o: $(srcdir)/src/os2/dc.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dc.cpp
+coredll_framuniv.o: $(srcdir)/src/univ/framuniv.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/framuniv.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_dcclient.o: $(srcdir)/src/gtk/dcclient.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dcclient.cpp
+coredll_univ_gauge.o: $(srcdir)/src/univ/gauge.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/gauge.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_dcclient.o: $(srcdir)/src/gtk1/dcclient.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/dcclient.cpp
+coredll_inpcons.o: $(srcdir)/src/univ/inpcons.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/inpcons.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
+coredll_inphand.o: $(srcdir)/src/univ/inphand.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/inphand.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
+coredll_univ_listbox.o: $(srcdir)/src/univ/listbox.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/listbox.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_dcclient.o: $(srcdir)/src/x11/dcclient.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/dcclient.cpp
+coredll_univ_menu.o: $(srcdir)/src/univ/menu.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/menu.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/dcclient.cpp
+coredll_univ_notebook.o: $(srcdir)/src/univ/notebook.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/notebook.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dcclient.o: $(srcdir)/src/dfb/dcclient.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/dcclient.cpp
+coredll_univ_radiobox.o: $(srcdir)/src/univ/radiobox.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/radiobox.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_dcclient.o: $(srcdir)/src/motif/dcclient.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dcclient.cpp
+coredll_univ_radiobut.o: $(srcdir)/src/univ/radiobut.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/radiobut.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
+coredll_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/scrarrow.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
+coredll_univ_scrolbar.o: $(srcdir)/src/univ/scrolbar.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/scrolbar.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_dcclient.o: $(srcdir)/src/cocoa/dcclient.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/dcclient.mm
+coredll_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/scrthumb.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dcclient.o: $(srcdir)/src/os2/dcclient.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dcclient.cpp
+coredll_settingsuniv.o: $(srcdir)/src/univ/settingsuniv.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/settingsuniv.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_dcmemory.o: $(srcdir)/src/gtk/dcmemory.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dcmemory.cpp
+coredll_univ_slider.o: $(srcdir)/src/univ/slider.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/slider.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_dcmemory.o: $(srcdir)/src/gtk1/dcmemory.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/dcmemory.cpp
+coredll_univ_spinbutt.o: $(srcdir)/src/univ/spinbutt.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/spinbutt.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
+coredll_univ_statbmp.o: $(srcdir)/src/univ/statbmp.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/statbmp.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
+coredll_univ_statbox.o: $(srcdir)/src/univ/statbox.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/statbox.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
+coredll_univ_statline.o: $(srcdir)/src/univ/statline.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/statline.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
+coredll_univ_stattext.o: $(srcdir)/src/univ/stattext.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/stattext.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_dcmemory.o: $(srcdir)/src/x11/dcmemory.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/dcmemory.cpp
+coredll_univ_statusbr.o: $(srcdir)/src/univ/statusbr.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/statusbr.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/dcmemory.cpp
+coredll_stdrend.o: $(srcdir)/src/univ/stdrend.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/stdrend.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dcmemory.o: $(srcdir)/src/dfb/dcmemory.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/dcmemory.cpp
+coredll_univ_textctrl.o: $(srcdir)/src/univ/textctrl.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/textctrl.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_dcmemory.o: $(srcdir)/src/motif/dcmemory.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dcmemory.cpp
+coredll_univ_tglbtn.o: $(srcdir)/src/univ/tglbtn.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/tglbtn.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/dcmemory.mm
+coredll_theme.o: $(srcdir)/src/univ/theme.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/theme.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dcmemory.cpp
+coredll_univ_toolbar.o: $(srcdir)/src/univ/toolbar.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/toolbar.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_dcscreen.o: $(srcdir)/src/gtk/dcscreen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dcscreen.cpp
+coredll_topluniv.o: $(srcdir)/src/univ/topluniv.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/topluniv.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_dcscreen.o: $(srcdir)/src/gtk1/dcscreen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/dcscreen.cpp
+coredll_winuniv.o: $(srcdir)/src/univ/winuniv.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/winuniv.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
+coredll_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/themes/gtk.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
+coredll_metal.o: $(srcdir)/src/univ/themes/metal.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/themes/metal.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_dcscreen.o: $(srcdir)/src/x11/dcscreen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/dcscreen.cpp
+coredll_mono.o: $(srcdir)/src/univ/themes/mono.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/themes/mono.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_dcscreen.o: $(srcdir)/src/mgl/dcscreen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/dcscreen.cpp
+coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/themes/win32.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dcscreen.o: $(srcdir)/src/dfb/dcscreen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/dcscreen.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_dcscreen.o: $(srcdir)/src/motif/dcscreen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dcscreen.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_dcscreen.o: $(srcdir)/src/cocoa/dcscreen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/dcscreen.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dcscreen.o: $(srcdir)/src/os2/dcscreen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dcscreen.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_dnd.o: $(srcdir)/src/gtk/dnd.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dnd.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_dnd.o: $(srcdir)/src/gtk1/dnd.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/dnd.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_dnd.o: $(srcdir)/src/osx/carbon/dnd.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dnd.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_dnd.o: $(srcdir)/src/osx/carbon/dnd.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dnd.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dnd.o: $(srcdir)/src/os2/dnd.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dnd.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_filectrl.o: $(srcdir)/src/gtk/filectrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/filectrl.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_font.o: $(srcdir)/src/gtk/font.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/font.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_font.o: $(srcdir)/src/gtk1/font.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/font.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_font.o: $(srcdir)/src/msw/font.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/font.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_font.o: $(srcdir)/src/msw/font.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/font.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_font.o: $(srcdir)/src/x11/font.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/font.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_font.o: $(srcdir)/src/mgl/font.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/font.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_font.o: $(srcdir)/src/dfb/font.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/font.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_font.o: $(srcdir)/src/motif/font.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/font.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_font.o: $(srcdir)/src/osx/carbon/font.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_font.o: $(srcdir)/src/osx/carbon/font.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_font.o: $(srcdir)/src/cocoa/font.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/font.mm
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_font.o: $(srcdir)/src/os2/font.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/font.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/gsockgtk.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gsockgtk.o: $(srcdir)/src/gtk1/gsockgtk.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/gsockgtk.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_minifram.o: $(srcdir)/src/gtk/minifram.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/minifram.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_minifram.o: $(srcdir)/src/gtk1/minifram.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/minifram.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_minifram.o: $(srcdir)/src/msw/minifram.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_minifram.o: $(srcdir)/src/msw/minifram.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_minifram.o: $(srcdir)/src/osx/minifram.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_minifram.o: $(srcdir)/src/osx/minifram.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_minifram.o: $(srcdir)/src/x11/minifram.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/minifram.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_minifram.o: $(srcdir)/src/motif/minifram.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/minifram.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_minifram.o: $(srcdir)/src/os2/minifram.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/minifram.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_pen.o: $(srcdir)/src/gtk/pen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/pen.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_uiactionx11.o: $(srcdir)/src/unix/uiactionx11.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/uiactionx11.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_pen.o: $(srcdir)/src/gtk1/pen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/pen.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_uiactionx11.o: $(srcdir)/src/unix/uiactionx11.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/uiactionx11.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_pen.o: $(srcdir)/src/x11/pen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_uiactionx11.o: $(srcdir)/src/unix/uiactionx11.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/uiactionx11.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_pen.o: $(srcdir)/src/x11/pen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_uiactionx11.o: $(srcdir)/src/unix/uiactionx11.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/uiactionx11.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_pen.o: $(srcdir)/src/msw/pen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_pen.o: $(srcdir)/src/msw/pen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_pen.o: $(srcdir)/src/osx/pen.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_pen.o: $(srcdir)/src/osx/pen.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_pen.o: $(srcdir)/src/mgl/pen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/pen.cpp
+@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_pen.o: $(srcdir)/src/dfb/pen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/pen.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_pen.o: $(srcdir)/src/cocoa/pen.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/pen.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_pen.o: $(srcdir)/src/os2/pen.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/pen.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_popupwin.o: $(srcdir)/src/gtk/popupwin.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/popupwin.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_popupwin.o: $(srcdir)/src/gtk1/popupwin.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/popupwin.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_popupwin.o: $(srcdir)/src/x11/popupwin.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/popupwin.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_popupwin.o: $(srcdir)/src/motif/popupwin.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/popupwin.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_app.o: $(srcdir)/src/gtk/app.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/app.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/bitmap.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_popupwin.o: $(srcdir)/src/os2/popupwin.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/popupwin.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_brush.o: $(srcdir)/src/gtk/brush.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/brush.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_private.o: $(srcdir)/src/gtk/private.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/private.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_clipbrd.o: $(srcdir)/src/gtk/clipbrd.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/clipbrd.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_region.o: $(srcdir)/src/gtk/region.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/region.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_colour.o: $(srcdir)/src/gtk/colour.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/colour.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_region.o: $(srcdir)/src/gtk1/region.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/region.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_cursor.o: $(srcdir)/src/gtk/cursor.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/cursor.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_region.o: $(srcdir)/src/x11/region.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/region.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_dataobj.o: $(srcdir)/src/gtk/dataobj.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dataobj.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_region.o: $(srcdir)/src/x11/region.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/region.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_dc.o: $(srcdir)/src/gtk/dc.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dc.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_region.o: $(srcdir)/src/msw/region.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/region.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_dcclient.o: $(srcdir)/src/gtk/dcclient.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dcclient.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_region.o: $(srcdir)/src/msw/region.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/region.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_dcmemory.o: $(srcdir)/src/gtk/dcmemory.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dcmemory.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_region.o: $(srcdir)/src/mgl/region.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/region.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_dcscreen.o: $(srcdir)/src/gtk/dcscreen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dcscreen.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_region.o: $(srcdir)/src/dfb/region.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/region.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_dnd.o: $(srcdir)/src/gtk/dnd.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dnd.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_region.o: $(srcdir)/src/osx/carbon/region.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/region.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/evtloop.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_region.o: $(srcdir)/src/cocoa/region.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/region.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_filectrl.o: $(srcdir)/src/gtk/filectrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/filectrl.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_region.o: $(srcdir)/src/os2/region.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/region.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_filehistory.o: $(srcdir)/src/gtk/filehistory.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/filehistory.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_renderer.o: $(srcdir)/src/gtk/renderer.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/renderer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_font.o: $(srcdir)/src/gtk/font.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/font.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_renderer.o: $(srcdir)/src/gtk1/renderer.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/renderer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_sockgtk.o: $(srcdir)/src/gtk/sockgtk.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/sockgtk.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_renderer.o: $(srcdir)/src/msw/renderer.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_minifram.o: $(srcdir)/src/gtk/minifram.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/minifram.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_renderer.o: $(srcdir)/src/msw/renderer.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_pen.o: $(srcdir)/src/gtk/pen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/pen.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_popupwin.o: $(srcdir)/src/gtk/popupwin.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/popupwin.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_private.o: $(srcdir)/src/gtk/private.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/private.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_settings.o: $(srcdir)/src/gtk/settings.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_region.o: $(srcdir)/src/gtk/region.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/region.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_settings.o: $(srcdir)/src/gtk1/settings.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_renderer.o: $(srcdir)/src/gtk/renderer.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/renderer.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_settings.o: $(srcdir)/src/msw/settings.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_settings.o: $(srcdir)/src/gtk/settings.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/settings.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_settings.o: $(srcdir)/src/msw/settings.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_timer.o: $(srcdir)/src/gtk/timer.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/timer.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_settings.o: $(srcdir)/src/x11/settings.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_tooltip.o: $(srcdir)/src/gtk/tooltip.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/tooltip.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_settings.o: $(srcdir)/src/mgl/settings.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_toplevel.o: $(srcdir)/src/gtk/toplevel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/toplevel.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_settings.o: $(srcdir)/src/dfb/settings.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_utilsgtk.o: $(srcdir)/src/gtk/utilsgtk.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/utilsgtk.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_settings.o: $(srcdir)/src/motif/settings.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_win_gtk.o: $(srcdir)/src/gtk/win_gtk.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/win_gtk.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_window.o: $(srcdir)/src/gtk/window.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/window.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_app.o: $(srcdir)/src/gtk1/app.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/app.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_settings.o: $(srcdir)/src/cocoa/settings.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/settings.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_bitmap.o: $(srcdir)/src/gtk1/bitmap.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/bitmap.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_settings.o: $(srcdir)/src/os2/settings.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_brush.o: $(srcdir)/src/gtk1/brush.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/brush.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_timer.o: $(srcdir)/src/gtk/timer.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/timer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_clipbrd.o: $(srcdir)/src/gtk1/clipbrd.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/clipbrd.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_timer.o: $(srcdir)/src/gtk1/timer.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/timer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_colour.o: $(srcdir)/src/gtk1/colour.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/colour.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_timer.o: $(srcdir)/src/osx/core/timer.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_cursor.o: $(srcdir)/src/gtk1/cursor.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/cursor.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_timer.o: $(srcdir)/src/osx/core/timer.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_data.o: $(srcdir)/src/gtk1/data.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/data.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_timer.o: $(srcdir)/src/generic/timer.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_dataobj.o: $(srcdir)/src/gtk1/dataobj.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/dataobj.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_timer.o: $(srcdir)/src/generic/timer.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_dc.o: $(srcdir)/src/gtk1/dc.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/dc.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_timer.o: $(srcdir)/src/generic/timer.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_dcclient.o: $(srcdir)/src/gtk1/dcclient.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/dcclient.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_timer.o: $(srcdir)/src/motif/timer.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/timer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_dcmemory.o: $(srcdir)/src/gtk1/dcmemory.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/dcmemory.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_timer.o: $(srcdir)/src/cocoa/timer.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/timer.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_dcscreen.o: $(srcdir)/src/gtk1/dcscreen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/dcscreen.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_timer.o: $(srcdir)/src/os2/timer.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/timer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_dnd.o: $(srcdir)/src/gtk1/dnd.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/dnd.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_tooltip.o: $(srcdir)/src/gtk/tooltip.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/tooltip.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_evtloop.o: $(srcdir)/src/gtk1/evtloop.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/evtloop.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_tooltip.o: $(srcdir)/src/gtk1/tooltip.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/tooltip.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_font.o: $(srcdir)/src/gtk1/font.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/font.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_sockgtk.o: $(srcdir)/src/gtk1/sockgtk.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/sockgtk.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_main.o: $(srcdir)/src/gtk1/main.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/main.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_tooltip.o: $(srcdir)/src/osx/carbon/tooltip.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tooltip.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_minifram.o: $(srcdir)/src/gtk1/minifram.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/minifram.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_tooltip.o: $(srcdir)/src/osx/carbon/tooltip.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tooltip.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_pen.o: $(srcdir)/src/gtk1/pen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/pen.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_tooltip.o: $(srcdir)/src/cocoa/tooltip.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/tooltip.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_popupwin.o: $(srcdir)/src/gtk1/popupwin.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/popupwin.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_tooltip.o: $(srcdir)/src/os2/tooltip.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/tooltip.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_region.o: $(srcdir)/src/gtk1/region.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/region.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_toplevel.o: $(srcdir)/src/gtk/toplevel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/toplevel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_renderer.o: $(srcdir)/src/gtk1/renderer.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/renderer.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_toplevel.o: $(srcdir)/src/gtk1/toplevel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/toplevel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_settings.o: $(srcdir)/src/gtk1/settings.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/settings.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_timer.o: $(srcdir)/src/gtk1/timer.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/timer.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_tooltip.o: $(srcdir)/src/gtk1/tooltip.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/tooltip.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_toplevel.o: $(srcdir)/src/x11/toplevel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/toplevel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_toplevel.o: $(srcdir)/src/gtk1/toplevel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/toplevel.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_toplevel.o: $(srcdir)/src/mgl/toplevel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/toplevel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_utilsgtk.o: $(srcdir)/src/gtk1/utilsgtk.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/utilsgtk.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_toplevel.o: $(srcdir)/src/dfb/toplevel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/toplevel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_win_gtk.o: $(srcdir)/src/gtk1/win_gtk.c $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/gtk1/win_gtk.c
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_toplevel.o: $(srcdir)/src/motif/toplevel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/toplevel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gtk1_window.o: $(srcdir)/src/gtk1/window.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/window.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_toplevel.o: $(srcdir)/src/cocoa/toplevel.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/toplevel.mm
+@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_toplevel.o: $(srcdir)/src/os2/toplevel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/toplevel.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_utilsgtk.o: $(srcdir)/src/gtk/utilsgtk.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/utilsgtk.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_x11_brush.o: $(srcdir)/src/x11/brush.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_utilsgtk.o: $(srcdir)/src/gtk1/utilsgtk.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/utilsgtk.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_brush.o: $(srcdir)/src/x11/brush.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_win_gtk.o: $(srcdir)/src/gtk/win_gtk.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/win_gtk.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_x11_palette.o: $(srcdir)/src/x11/palette.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_win_gtk.o: $(srcdir)/src/gtk1/win_gtk.c $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/gtk1/win_gtk.c
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_palette.o: $(srcdir)/src/x11/palette.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_window.o: $(srcdir)/src/gtk/window.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/window.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_x11_pen.o: $(srcdir)/src/x11/pen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_window.o: $(srcdir)/src/gtk1/window.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/window.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_pen.o: $(srcdir)/src/x11/pen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_window.o: $(srcdir)/src/msw/window.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/window.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_x11_region.o: $(srcdir)/src/x11/region.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/region.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_window.o: $(srcdir)/src/msw/window.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/window.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_region.o: $(srcdir)/src/x11/region.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/region.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_window.o: $(srcdir)/src/x11/window.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/window.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_window.o: $(srcdir)/src/mgl/window.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/window.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_window.o: $(srcdir)/src/dfb/window.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/window.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_window.o: $(srcdir)/src/motif/window.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/window.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_window.o: $(srcdir)/src/osx/carbon/window.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/window.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_app.o: $(srcdir)/src/msw/app.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/app.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_window.o: $(srcdir)/src/osx/cocoa/window.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/window.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_app.o: $(srcdir)/src/msw/app.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/app.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_window.o: $(srcdir)/src/cocoa/window.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/window.mm
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_window.o: $(srcdir)/src/os2/window.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/window.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_data.o: $(srcdir)/src/gtk1/data.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/data.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_brush.o: $(srcdir)/src/msw/brush.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_data.o: $(srcdir)/src/msw/data.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/data.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_brush.o: $(srcdir)/src/msw/brush.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_data.o: $(srcdir)/src/msw/data.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/data.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_caret.o: $(srcdir)/src/msw/caret.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_data.o: $(srcdir)/src/x11/data.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/data.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_caret.o: $(srcdir)/src/msw/caret.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_data.o: $(srcdir)/src/mgl/data.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/data.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_data.o: $(srcdir)/src/motif/data.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/data.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_data.o: $(srcdir)/src/cocoa/data.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/data.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_colour.o: $(srcdir)/src/msw/colour.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_data.o: $(srcdir)/src/os2/data.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/data.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_colour.o: $(srcdir)/src/msw/colour.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_palette.o: $(srcdir)/src/x11/palette.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_cursor.o: $(srcdir)/src/msw/cursor.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_palette.o: $(srcdir)/src/x11/palette.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_cursor.o: $(srcdir)/src/msw/cursor.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_palette.o: $(srcdir)/src/msw/palette.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_data.o: $(srcdir)/src/msw/data.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/data.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_palette.o: $(srcdir)/src/msw/palette.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_data.o: $(srcdir)/src/msw/data.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/data.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_palette.o: $(srcdir)/src/osx/palette.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_dc.o: $(srcdir)/src/msw/dc.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_palette.o: $(srcdir)/src/osx/palette.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_dc.o: $(srcdir)/src/msw/dc.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_palette.o: $(srcdir)/src/mgl/palette.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/palette.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_palette.o: $(srcdir)/src/os2/palette.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/palette.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_dialup.o: $(srcdir)/src/msw/dialup.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dcprint.o: $(srcdir)/src/os2/dcprint.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dcprint.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_dialup.o: $(srcdir)/src/msw/dialup.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@coredll_dib.o: $(srcdir)/src/msw/dib.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@coredll_dib.o: $(srcdir)/src/msw/dib.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
@@ -25407,65 +29141,83 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_dib.o: $(srcdir)/src/msw/dib.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_dib.o: $(srcdir)/src/msw/dib.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_display.o: $(srcdir)/src/msw/display.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_display.o: $(srcdir)/src/msw/display.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/display.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/display.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_display.o: $(srcdir)/src/msw/display.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_display.o: $(srcdir)/src/msw/display.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/display.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/display.cpp
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_display.o: $(srcdir)/src/osx/core/display.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_display.o: $(srcdir)/src/osx/core/display.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_display.o: $(srcdir)/src/cocoa/display.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/display.mm
-
  @COND_TOOLKIT_MSW_USE_GUI_1@coredll_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@coredll_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_font.o: $(srcdir)/src/msw/font.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/font.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_font.o: $(srcdir)/src/msw/font.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/font.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/gdiimage.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
-
  @COND_TOOLKIT_MSW_USE_GUI_1@coredll_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@coredll_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_graphics.o: $(srcdir)/src/msw/graphics.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_graphics.o: $(srcdir)/src/msw/graphics.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_graphics.o: $(srcdir)/src/msw/graphics.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_graphics.o: $(srcdir)/src/msw/graphics.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_icon.o: $(srcdir)/src/msw/icon.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_icon.o: $(srcdir)/src/msw/icon.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_minifram.o: $(srcdir)/src/msw/minifram.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_minifram.o: $(srcdir)/src/msw/minifram.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_ole_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_ole_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@coredll_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/dropsrc.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@coredll_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/dropsrc.cpp
@@ -25485,17 +29237,29 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_palette.o: $(srcdir)/src/msw/palette.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_palette.o: $(srcdir)/src/msw/palette.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_pen.o: $(srcdir)/src/msw/pen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_pen.o: $(srcdir)/src/msw/pen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_printdlg.o: $(srcdir)/src/osx/carbon/printdlg.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/printdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_printdlg.o: $(srcdir)/src/osx/carbon/printdlg.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/printdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@coredll_printwin.o: $(srcdir)/src/msw/printwin.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/printwin.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@coredll_printwin.o: $(srcdir)/src/msw/printwin.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/printwin.cpp
@@ -25503,314 +29267,488 @@ 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) $(srcdir)/src/msw/printwin.cpp
  
  @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) $(srcdir)/src/msw/printwin.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_region.o: $(srcdir)/src/msw/region.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/region.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_region.o: $(srcdir)/src/msw/region.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/region.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_renderer.o: $(srcdir)/src/msw/renderer.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_renderer.o: $(srcdir)/src/msw/renderer.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_settings.o: $(srcdir)/src/msw/settings.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_settings.o: $(srcdir)/src/msw/settings.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_uiaction.o: $(srcdir)/src/msw/uiaction.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/uiaction.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_uiaction.o: $(srcdir)/src/msw/uiaction.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/uiaction.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/utilsgui.cpp
-
  @COND_TOOLKIT_MSW_USE_GUI_1@coredll_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@coredll_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@coredll_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
  
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_window.o: $(srcdir)/src/msw/window.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/window.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_msw_window.o: $(srcdir)/src/msw/window.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/window.cpp
+
  @COND_TOOLKIT_MSW_USE_GUI_1@coredll_helpchm.o: $(srcdir)/src/msw/helpchm.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/helpchm.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@coredll_helpchm.o: $(srcdir)/src/msw/helpchm.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/helpchm.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1@coredll_helpwin.o: $(srcdir)/src/msw/helpwin.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_helpwin.o: $(srcdir)/src/msw/helpwin.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/helpwin.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/helpwin.cpp
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/helpwin.cpp
-
  @COND_TOOLKIT_MSW_USE_GUI_1@coredll_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/automtn.cpp
  
  @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) $(srcdir)/src/msw/ole/uuid.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@coredll_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/automtn.cpp
  
  @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) $(srcdir)/src/msw/ole/uuid.cpp
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_accel.o: $(srcdir)/src/osx/accel.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_accel.o: $(srcdir)/src/osx/accel.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@coredll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_osx_brush.o: $(srcdir)/src/osx/brush.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_osx_brush.o: $(srcdir)/src/osx/brush.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@coredll_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@coredll_osx_brush.o: $(srcdir)/src/osx/brush.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/motif/accel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/msw/accel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/msw/accel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@coredll_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_accel.o: $(srcdir)/src/os2/accel.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_osx_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_osx_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_artmac.o: $(srcdir)/src/osx/artmac.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@coredll_osx_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_osx_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_osx_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@coredll_osx_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_osx_minifram.o: $(srcdir)/src/osx/minifram.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_osx_minifram.o: $(srcdir)/src/osx/minifram.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@coredll_osx_minifram.o: $(srcdir)/src/osx/minifram.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@coredll_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_osx_palette.o: $(srcdir)/src/osx/palette.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_osx_palette.o: $(srcdir)/src/osx/palette.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@coredll_osx_palette.o: $(srcdir)/src/osx/palette.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_osx_pen.o: $(srcdir)/src/osx/pen.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_osx_pen.o: $(srcdir)/src/osx/pen.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@coredll_osx_pen.o: $(srcdir)/src/osx/pen.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@coredll_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_uiaction_osx.o: $(srcdir)/src/osx/uiaction_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/uiaction_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_uiaction_osx.o: $(srcdir)/src/osx/uiaction_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/uiaction_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@coredll_uiaction_osx.o: $(srcdir)/src/osx/uiaction_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/uiaction_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@coredll_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@coredll_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_core_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_core_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@coredll_core_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_core_colour.o: $(srcdir)/src/osx/core/colour.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_core_colour.o: $(srcdir)/src/osx/core/colour.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@coredll_core_colour.o: $(srcdir)/src/osx/core/colour.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_core_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_core_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@coredll_core_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_core_display.o: $(srcdir)/src/osx/core/display.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_core_display.o: $(srcdir)/src/osx/core/display.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@coredll_core_display.o: $(srcdir)/src/osx/core/display.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_core_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_core_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@coredll_core_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@coredll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1@coredll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@coredll_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_core_timer.o: $(srcdir)/src/osx/core/timer.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_core_timer.o: $(srcdir)/src/osx/core/timer.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@coredll_core_timer.o: $(srcdir)/src/osx/core/timer.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@coredll_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1@coredll_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_generic_timer.o: $(srcdir)/src/generic/timer.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_generic_timer.o: $(srcdir)/src/generic/timer.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_app.o: $(srcdir)/src/x11/app.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/app.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_clipbrd.o: $(srcdir)/src/x11/clipbrd.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/clipbrd.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_colour.o: $(srcdir)/src/x11/colour.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/colour.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_cursor.o: $(srcdir)/src/x11/cursor.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/cursor.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_data.o: $(srcdir)/src/x11/data.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/data.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_dataobj.o: $(srcdir)/src/x11/dataobj.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/dataobj.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_dc.o: $(srcdir)/src/x11/dc.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/dc.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_dcclient.o: $(srcdir)/src/x11/dcclient.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/dcclient.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_dcmemory.o: $(srcdir)/src/x11/dcmemory.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/dcmemory.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_dcscreen.o: $(srcdir)/src/x11/dcscreen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/dcscreen.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_evtloop.o: $(srcdir)/src/x11/evtloop.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/evtloop.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_font.o: $(srcdir)/src/x11/font.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/font.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_minifram.o: $(srcdir)/src/x11/minifram.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/minifram.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_nanox.o: $(srcdir)/src/x11/nanox.c $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/x11/nanox.c
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_popupwin.o: $(srcdir)/src/x11/popupwin.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/popupwin.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_reparent.o: $(srcdir)/src/x11/reparent.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/reparent.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_settings.o: $(srcdir)/src/x11/settings.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/settings.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_toplevel.o: $(srcdir)/src/x11/toplevel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/toplevel.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_utils.o: $(srcdir)/src/x11/utils.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/utils.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_x11_window.o: $(srcdir)/src/x11/window.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/window.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_generic_colour.o: $(srcdir)/src/generic/colour.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_generic_colour.o: $(srcdir)/src/generic/colour.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mask.o: $(srcdir)/src/generic/mask.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_mask.o: $(srcdir)/src/generic/mask.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_app.o: $(srcdir)/src/mgl/app.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/app.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/bitmap.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_brush.o: $(srcdir)/src/mgl/brush.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/brush.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_clipbrd.o: $(srcdir)/src/mgl/clipbrd.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/clipbrd.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_tabctrl_osx.o: $(srcdir)/src/osx/tabctrl_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/tabctrl_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_cursor.o: $(srcdir)/src/mgl/cursor.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/cursor.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_tabctrl_osx.o: $(srcdir)/src/osx/tabctrl_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/tabctrl_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_data.o: $(srcdir)/src/mgl/data.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/data.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_dc.o: $(srcdir)/src/mgl/dc.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/dc.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/dcclient.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/dcmemory.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_dcscreen.o: $(srcdir)/src/mgl/dcscreen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/dcscreen.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/dirmgl.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/evtloop.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_font.o: $(srcdir)/src/mgl/font.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/font.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_fontenum.o: $(srcdir)/src/mgl/fontenum.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/fontenum.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_fontmgr.o: $(srcdir)/src/mgl/fontmgr.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/fontmgr.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_fontutil.o: $(srcdir)/src/mgl/fontutil.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/fontutil.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_palette.o: $(srcdir)/src/mgl/palette.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/palette.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_pen.o: $(srcdir)/src/mgl/pen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/pen.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_region.o: $(srcdir)/src/mgl/region.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/region.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_settings.o: $(srcdir)/src/mgl/settings.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/settings.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1@coredll_hid.o: $(srcdir)/src/osx/core/hid.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_toplevel.o: $(srcdir)/src/mgl/toplevel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/toplevel.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_utils.o: $(srcdir)/src/mgl/utils.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/utils.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mgl_window.o: $(srcdir)/src/mgl/window.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/window.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@coredll_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_app.o: $(srcdir)/src/dfb/app.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/app.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@coredll_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_bitmap.o: $(srcdir)/src/dfb/bitmap.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/bitmap.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1@coredll_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_brush.o: $(srcdir)/src/dfb/brush.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/brush.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_nanox.o: $(srcdir)/src/x11/nanox.c $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/x11/nanox.c
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_cursor.o: $(srcdir)/src/dfb/cursor.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/cursor.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_reparent.o: $(srcdir)/src/x11/reparent.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/reparent.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_dc.o: $(srcdir)/src/dfb/dc.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/dc.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_dcclient.o: $(srcdir)/src/dfb/dcclient.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/dcclient.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_dcmemory.o: $(srcdir)/src/dfb/dcmemory.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/dcmemory.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_mask.o: $(srcdir)/src/generic/mask.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_dcscreen.o: $(srcdir)/src/dfb/dcscreen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/dcscreen.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_mask.o: $(srcdir)/src/generic/mask.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_evtloop.o: $(srcdir)/src/dfb/evtloop.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/evtloop.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/dirmgl.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_font.o: $(srcdir)/src/dfb/font.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/font.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_fontmgr.o: $(srcdir)/src/mgl/fontmgr.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/fontmgr.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_fontenum.o: $(srcdir)/src/dfb/fontenum.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/fontenum.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_fontmgr.o: $(srcdir)/src/dfb/fontmgr.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_fontmgr.o: $(srcdir)/src/dfb/fontmgr.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/fontmgr.cpp
  
  @COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/fontmgr.cpp
  
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_nonownedwnd.o: $(srcdir)/src/dfb/nonownedwnd.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_nonownedwnd.o: $(srcdir)/src/dfb/nonownedwnd.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/nonownedwnd.cpp
  
  @COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/nonownedwnd.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_nonownedwnd.o: $(srcdir)/src/osx/carbon/nonownedwnd.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/nonownedwnd.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_overlay.o: $(srcdir)/src/dfb/overlay.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/overlay.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_pen.o: $(srcdir)/src/dfb/pen.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/pen.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_nonownedwnd.o: $(srcdir)/src/osx/cocoa/nonownedwnd.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/nonownedwnd.mm
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_region.o: $(srcdir)/src/dfb/region.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/region.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@coredll_overlay.o: $(srcdir)/src/dfb/overlay.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/overlay.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_settings.o: $(srcdir)/src/dfb/settings.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/settings.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_toplevel.o: $(srcdir)/src/dfb/toplevel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/toplevel.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_utils.o: $(srcdir)/src/dfb/utils.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/utils.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_dfb_window.o: $(srcdir)/src/dfb/window.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/window.cpp
  
  @COND_TOOLKIT_DFB_USE_GUI_1@coredll_wrapdfb.o: $(srcdir)/src/dfb/wrapdfb.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/wrapdfb.cpp
  
  @COND_TOOLKIT_DFB_USE_GUI_1@coredll_wrapdfb.o: $(srcdir)/src/dfb/wrapdfb.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/dfb/wrapdfb.cpp
@@ -25821,36 +29759,48 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_PLATFORM_MACOSX_1_USE_GUI_1@coredll_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(COREDLL_ODEP)
  @COND_PLATFORM_MACOSX_1_USE_GUI_1@     $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
  
  @COND_PLATFORM_MACOSX_1_USE_GUI_1@coredll_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(COREDLL_ODEP)
  @COND_PLATFORM_MACOSX_1_USE_GUI_1@     $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_USE_GUI_1_WXUNIV_1@coredll_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
-@COND_USE_GUI_1_WXUNIV_1@coredll_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@coredll_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_fdrepdlg.o: $(srcdir)/src/msw/fdrepdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/fdrepdlg.cpp
-
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
@@ -25866,11 +29816,14 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
@@ -25881,36 +29834,33 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
  @COND_USE_GUI_1_WXUNIV_1@coredll_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
-@COND_USE_GUI_1_WXUNIV_1@coredll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@coredll_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
-
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
@@ -25926,11 +29876,14 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
@@ -25938,57 +29891,36 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
  @COND_USE_GUI_1_WXUNIV_1@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
-@COND_USE_GUI_1_WXUNIV_1@coredll_statusbr.o: $(srcdir)/src/univ/statusbr.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/statusbr.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@coredll_tabg.o: $(srcdir)/src/generic/tabg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
@@ -26001,11 +29933,14 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
@@ -26013,1151 +29948,956 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
  @COND_USE_GUI_1_WXUNIV_1@coredll_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@coredll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/gtk/bmpbuttn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/bmpbuttn.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/gtk1/bmpbuttn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/bmpbuttn.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/motif/bmpbuttn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/bmpbuttn.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/osx/carbon/bmpbuttn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/bmpbuttn.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/osx/cocoa/bmpbuttn.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/bmpbuttn.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/cocoa/bmpbuttn.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/bmpbuttn.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/bmpbuttn.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@coredll_bmpbuttn.o: $(srcdir)/src/univ/bmpbuttn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/bmpbuttn.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_button.o: $(srcdir)/src/gtk/button.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/button.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_button.o: $(srcdir)/src/gtk1/button.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/button.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_button.o: $(srcdir)/src/motif/button.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/button.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_button.o: $(srcdir)/src/msw/button.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/button.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_button.o: $(srcdir)/src/msw/button.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/button.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_button.o: $(srcdir)/src/osx/carbon/button.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/button.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_button.o: $(srcdir)/src/osx/cocoa/button.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/button.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_button.o: $(srcdir)/src/cocoa/button.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/button.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_button.o: $(srcdir)/src/os2/button.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/button.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@coredll_button.o: $(srcdir)/src/univ/button.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/button.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_checkbox.o: $(srcdir)/src/gtk/checkbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/checkbox.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_checkbox.o: $(srcdir)/src/gtk1/checkbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/checkbox.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_checkbox.o: $(srcdir)/src/motif/checkbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/checkbox.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_checkbox.o: $(srcdir)/src/osx/carbon/checkbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/checkbox.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_checkbox.o: $(srcdir)/src/osx/cocoa/checkbox.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/checkbox.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_checkbox.o: $(srcdir)/src/cocoa/checkbox.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/checkbox.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_checkbox.o: $(srcdir)/src/os2/checkbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/checkbox.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@coredll_checkbox.o: $(srcdir)/src/univ/checkbox.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/checkbox.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_checklst.o: $(srcdir)/src/gtk/checklst.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/checklst.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_checklst.o: $(srcdir)/src/gtk1/checklst.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/checklst.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_checklst.o: $(srcdir)/src/motif/checklst.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/checklst.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_checklst.o: $(srcdir)/src/msw/checklst.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_checklst.o: $(srcdir)/src/msw/wince/checklst.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/wince/checklst.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_checklst.o: $(srcdir)/src/cocoa/checklst.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/checklst.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_checklst.o: $(srcdir)/src/os2/checklst.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/checklst.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@coredll_checklst.o: $(srcdir)/src/univ/checklst.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/checklst.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/gtk/choice.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/choice.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/gtk1/choice.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/choice.cpp
+@COND_USE_GUI_1_WXUNIV_1@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/motif/choice.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/choice.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/msw/choice.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/msw/choice.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/osx/carbon/choice.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/choice.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/osx/cocoa/choice.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/choice.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/cocoa/choice.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/choice.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_choice.o: $(srcdir)/src/os2/choice.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/choice.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@coredll_choice.o: $(srcdir)/src/univ/choice.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/choice.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_colordlg.o: $(srcdir)/src/gtk/colordlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/colordlg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
+@COND_USE_GUI_1_WXUNIV_1@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_colordlg.o: $(srcdir)/src/osx/carbon/colordlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlg.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_colordlg.o: $(srcdir)/src/cocoa/colordlg.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/colordlg.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_combobox.o: $(srcdir)/src/gtk/combobox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_combobox.o: $(srcdir)/src/gtk1/combobox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_combobox.o: $(srcdir)/src/motif/combobox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/combobox.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_combobox.o: $(srcdir)/src/msw/combobox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_combobox.o: $(srcdir)/src/msw/combobox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
+@COND_USE_GUI_1_WXUNIV_1@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_combobox.o: $(srcdir)/src/cocoa/combobox.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/combobox.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_combobox.o: $(srcdir)/src/os2/combobox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@coredll_combobox.o: $(srcdir)/src/univ/combobox.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_control.o: $(srcdir)/src/gtk/control.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_control.o: $(srcdir)/src/gtk1/control.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/control.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_control.o: $(srcdir)/src/motif/control.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/control.cpp
+@COND_USE_GUI_1_WXUNIV_1@coredll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_control.o: $(srcdir)/src/msw/control.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/control.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_control.o: $(srcdir)/src/msw/control.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/control.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_control.o: $(srcdir)/src/osx/carbon/control.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_control.o: $(srcdir)/src/osx/carbon/control.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_control.o: $(srcdir)/src/cocoa/control.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/control.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_control.o: $(srcdir)/src/os2/control.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/control.cpp
+@COND_USE_GUI_1_WXUNIV_1@coredll_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@coredll_control.o: $(srcdir)/src/univ/control.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/control.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/gtk/dialog.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dialog.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/gtk1/dialog.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/dialog.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/motif/dialog.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/dialog.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/msw/dialog.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/msw/dialog.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/osx/carbon/dialog.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/osx/cocoa/dialog.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/dialog.mm
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/cocoa/dialog.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/dialog.mm
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dialog.o: $(srcdir)/src/os2/dialog.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/dialog.cpp
+@COND_USE_GUI_1_WXUNIV_1@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@coredll_dialog.o: $(srcdir)/src/univ/dialog.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/dialog.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_dirdlg.o: $(srcdir)/src/gtk/dirdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/dirdlg.cpp
+@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) $(srcdir)/src/generic/mdig.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
+@COND_USE_GUI_1_WXUNIV_1@coredll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_dirdlg.o: $(srcdir)/src/osx/carbon/dirdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dirdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_dirdlg.o: $(srcdir)/src/osx/cocoa/dirdlg.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/dirdlg.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_anybutton.o: $(srcdir)/src/msw/anybutton.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/anybutton.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_dirdlg.o: $(srcdir)/src/cocoa/dirdlg.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/dirdlg.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_anybutton.o: $(srcdir)/src/msw/anybutton.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/anybutton.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/gtk/filedlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/filedlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_artmsw.o: $(srcdir)/src/msw/artmsw.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/artmsw.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/gtk1/filedlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/filedlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_artmsw.o: $(srcdir)/src/msw/artmsw.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/artmsw.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/filedlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_button.o: $(srcdir)/src/msw/button.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/button.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/osx/carbon/filedlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/filedlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_button.o: $(srcdir)/src/msw/button.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/button.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/osx/cocoa/filedlg.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/filedlg.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/cocoa/filedlg.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/filedlg.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_filedlg.o: $(srcdir)/src/os2/filedlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/filedlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_choice.o: $(srcdir)/src/msw/choice.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_fontdlg.o: $(srcdir)/src/gtk/fontdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/fontdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_choice.o: $(srcdir)/src/msw/choice.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_fontdlg.o: $(srcdir)/src/gtk1/fontdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/fontdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_fontdlg.o: $(srcdir)/src/msw/fontdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/fontdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_combo.o: $(srcdir)/src/msw/combo.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_combo.o: $(srcdir)/src/msw/combo.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontdlg.o: $(srcdir)/src/cocoa/fontdlg.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/fontdlg.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_combobox.o: $(srcdir)/src/msw/combobox.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_fontdlg.o: $(srcdir)/src/os2/fontdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/fontdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_combobox.o: $(srcdir)/src/msw/combobox.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_frame.o: $(srcdir)/src/gtk/frame.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/frame.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_control.o: $(srcdir)/src/msw/control.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/control.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_frame.o: $(srcdir)/src/gtk1/frame.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/frame.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_control.o: $(srcdir)/src/msw/control.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/control.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_frame.o: $(srcdir)/src/motif/frame.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/frame.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_dialog.o: $(srcdir)/src/msw/dialog.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_frame.o: $(srcdir)/src/msw/frame.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_dialog.o: $(srcdir)/src/msw/dialog.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_frame.o: $(srcdir)/src/msw/frame.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_frame.o: $(srcdir)/src/cocoa/frame.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/frame.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_frame.o: $(srcdir)/src/os2/frame.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/frame.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/gtk/gauge.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/gauge.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/gtk1/gauge.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/gauge.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_frame.o: $(srcdir)/src/msw/frame.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/motif/gauge.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_frame.o: $(srcdir)/src/msw/frame.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/msw/gauge.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_gauge.o: $(srcdir)/src/msw/gauge.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/msw/gauge.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_gauge.o: $(srcdir)/src/msw/gauge.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/osx/carbon/gauge.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gauge.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/osx/cocoa/gauge.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/gauge.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/cocoa/gauge.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/gauge.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_headerctrl.o: $(srcdir)/src/msw/headerctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/headerctrl.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_gauge.o: $(srcdir)/src/os2/gauge.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/gauge.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_headerctrl.o: $(srcdir)/src/msw/headerctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/headerctrl.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@coredll_gauge.o: $(srcdir)/src/univ/gauge.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/gauge.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_print.o: $(srcdir)/src/gtk/print.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/print.cpp
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_print.o: $(srcdir)/src/os2/print.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/print.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/gtk/listbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/listbox.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/gtk1/listbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/listbox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/motif/listbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/listbox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/msw/listbox.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_listbox.o: $(srcdir)/src/msw/listbox.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/msw/listbox.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_listbox.o: $(srcdir)/src/msw/listbox.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/osx/carbon/listbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/listbox.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/osx/cocoa/listbox.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/listbox.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/cocoa/listbox.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/listbox.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/os2/listbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/listbox.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@coredll_listbox.o: $(srcdir)/src/univ/listbox.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/listbox.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_mdi.o: $(srcdir)/src/gtk/mdi.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/mdi.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_mdi.o: $(srcdir)/src/gtk1/mdi.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/mdi.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_mdi.o: $(srcdir)/src/motif/mdi.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/mdi.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_mdi.o: $(srcdir)/src/msw/mdi.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_mdi.o: $(srcdir)/src/msw/mdi.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_mdi.o: $(srcdir)/src/msw/mdi.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_mdi.o: $(srcdir)/src/msw/mdi.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_mdi.o: $(srcdir)/src/cocoa/mdi.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/mdi.mm
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_menu.o: $(srcdir)/src/gtk/menu.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/menu.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_menu.o: $(srcdir)/src/gtk1/menu.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/menu.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_menu.o: $(srcdir)/src/motif/menu.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/menu.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_menu.o: $(srcdir)/src/msw/menu.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_menu.o: $(srcdir)/src/msw/menu.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_menu.o: $(srcdir)/src/msw/menu.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_menu.o: $(srcdir)/src/msw/menu.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_menu.o: $(srcdir)/src/osx/carbon/menu.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/menu.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_menu.o: $(srcdir)/src/osx/cocoa/menu.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/menu.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_menu.o: $(srcdir)/src/cocoa/menu.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/menu.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_menu.o: $(srcdir)/src/os2/menu.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/menu.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@coredll_menu.o: $(srcdir)/src/univ/menu.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/menu.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_msgdlg.o: $(srcdir)/src/gtk/msgdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/msgdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_metafile.o: $(srcdir)/src/msw/metafile.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_msgdlg.o: $(srcdir)/src/motif/msgdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/msgdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_metafile.o: $(srcdir)/src/msw/metafile.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_msgdlg.o: $(srcdir)/src/osx/carbon/msgdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/msgdlg.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_msgdlg.o: $(srcdir)/src/osx/cocoa/msgdlg.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/msgdlg.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_msgdlg.o: $(srcdir)/src/cocoa/msgdlg.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/msgdlg.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_msgdlg.o: $(srcdir)/src/os2/msgdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/msgdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_nativewin.o: $(srcdir)/src/gtk/nativewin.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/nativewin.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_notebook.o: $(srcdir)/src/gtk/notebook.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/notebook.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_notebook.o: $(srcdir)/src/gtk1/notebook.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/notebook.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_notebook.o: $(srcdir)/src/generic/notebook.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/notebook.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_notebook.o: $(srcdir)/src/msw/notebook.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_notebook.o: $(srcdir)/src/msw/notebook.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_notebook.o: $(srcdir)/src/msw/notebook.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_notebook.o: $(srcdir)/src/msw/notebook.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_notebook.o: $(srcdir)/src/osx/cocoa/notebook.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/notebook.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_access.o: $(srcdir)/src/msw/ole/access.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_access.o: $(srcdir)/src/msw/ole/access.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_notebook.o: $(srcdir)/src/cocoa/notebook.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/notebook.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_notebook.o: $(srcdir)/src/os2/notebook.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/notebook.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@coredll_notebook.o: $(srcdir)/src/univ/notebook.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/notebook.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_panel.o: $(srcdir)/src/msw/panel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/panel.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_radiobox.o: $(srcdir)/src/gtk/radiobox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/radiobox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_panel.o: $(srcdir)/src/msw/panel.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/panel.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_radiobox.o: $(srcdir)/src/gtk1/radiobox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/radiobox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_progdlg.o: $(srcdir)/src/msw/progdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/progdlg.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_radiobox.o: $(srcdir)/src/motif/radiobox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/radiobox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_progdlg.o: $(srcdir)/src/msw/progdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/progdlg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_radiobox.o: $(srcdir)/src/cocoa/radiobox.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/radiobox.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_radiobox.o: $(srcdir)/src/os2/radiobox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/radiobox.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@coredll_radiobox.o: $(srcdir)/src/univ/radiobox.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/radiobox.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_radiobut.o: $(srcdir)/src/gtk/radiobut.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/radiobut.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_radiobut.o: $(srcdir)/src/gtk1/radiobut.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/radiobut.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_radiobut.o: $(srcdir)/src/motif/radiobut.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/radiobut.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_radiobut.o: $(srcdir)/src/osx/carbon/radiobut.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/radiobut.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_richmsgdlg.o: $(srcdir)/src/msw/richmsgdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/richmsgdlg.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_radiobut.o: $(srcdir)/src/osx/cocoa/radiobut.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/radiobut.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_richmsgdlg.o: $(srcdir)/src/msw/richmsgdlg.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/richmsgdlg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_radiobut.o: $(srcdir)/src/cocoa/radiobut.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/radiobut.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_radiobut.o: $(srcdir)/src/os2/radiobut.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/radiobut.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@coredll_radiobut.o: $(srcdir)/src/univ/radiobut.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/radiobut.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_slider.o: $(srcdir)/src/msw/slider.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_scrolbar.o: $(srcdir)/src/gtk/scrolbar.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/scrolbar.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_slider.o: $(srcdir)/src/msw/slider.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_scrolbar.o: $(srcdir)/src/gtk1/scrolbar.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/scrolbar.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/scrolbar.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_scrolbar.o: $(srcdir)/src/osx/carbon/scrolbar.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/scrolbar.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_scrolbar.o: $(srcdir)/src/osx/cocoa/scrolbar.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/scrolbar.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_scrolbar.o: $(srcdir)/src/cocoa/scrolbar.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/scrolbar.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_statbox.o: $(srcdir)/src/msw/statbox.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/scrolbar.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_statbox.o: $(srcdir)/src/msw/statbox.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@coredll_scrolbar.o: $(srcdir)/src/univ/scrolbar.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/scrolbar.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_scrolwin.o: $(srcdir)/src/gtk/scrolwin.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/scrolwin.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_scrolwin.o: $(srcdir)/src/gtk1/scrolwin.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/scrolwin.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_statline.o: $(srcdir)/src/msw/statline.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/gtk/slider.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/slider.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_statline.o: $(srcdir)/src/msw/statline.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/gtk1/slider.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/slider.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_stattext.o: $(srcdir)/src/msw/stattext.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/motif/slider.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/slider.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_stattext.o: $(srcdir)/src/msw/stattext.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/msw/slider.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/msw/slider.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/osx/carbon/slider.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/slider.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/osx/cocoa/slider.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/slider.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/cocoa/slider.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/slider.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_textentry.o: $(srcdir)/src/msw/textentry.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_slider.o: $(srcdir)/src/os2/slider.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/slider.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_textentry.o: $(srcdir)/src/msw/textentry.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@coredll_slider.o: $(srcdir)/src/univ/slider.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/slider.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_msw_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_spinbutt.o: $(srcdir)/src/gtk/spinbutt.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/spinbutt.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_msw_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_spinbutt.o: $(srcdir)/src/gtk1/spinbutt.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/spinbutt.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_spinbutt.o: $(srcdir)/src/motif/spinbutt.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/spinbutt.cpp
+@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) $(srcdir)/src/msw/treectrl.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_anybutton_osx.o: $(srcdir)/src/osx/anybutton_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/anybutton_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_anybutton_osx.o: $(srcdir)/src/osx/anybutton_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/anybutton_osx.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_spinbutt.o: $(srcdir)/src/osx/carbon/spinbutt.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/spinbutt.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_anybutton_osx.o: $(srcdir)/src/osx/anybutton_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/anybutton_osx.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_spinbutt.o: $(srcdir)/src/osx/cocoa/spinbutt.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/spinbutt.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_spinbutt.o: $(srcdir)/src/cocoa/spinbutt.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/spinbutt.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_spinbutt.o: $(srcdir)/src/os2/spinbutt.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/spinbutt.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@coredll_spinbutt.o: $(srcdir)/src/univ/spinbutt.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/spinbutt.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_spinctrl.o: $(srcdir)/src/gtk/spinctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/spinctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_spinctrl.o: $(srcdir)/src/gtk1/spinctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/spinctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/spinctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_statbmp.o: $(srcdir)/src/gtk/statbmp.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_statbmp.o: $(srcdir)/src/gtk1/statbmp.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_statbmp.o: $(srcdir)/src/motif/statbmp.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_statbmp.o: $(srcdir)/src/osx/carbon/statbmp.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_statbmp.o: $(srcdir)/src/cocoa/statbmp.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/statbmp.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_combobox_osx.o: $(srcdir)/src/osx/combobox_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/combobox_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_statbmp.o: $(srcdir)/src/os2/statbmp.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_combobox_osx.o: $(srcdir)/src/osx/combobox_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/combobox_osx.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@coredll_statbmp.o: $(srcdir)/src/univ/statbmp.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_combobox_osx.o: $(srcdir)/src/osx/combobox_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/combobox_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_statbox.o: $(srcdir)/src/gtk/statbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_dnd_osx.o: $(srcdir)/src/osx/dnd_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/dnd_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_statbox.o: $(srcdir)/src/gtk1/statbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_dnd_osx.o: $(srcdir)/src/osx/dnd_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/dnd_osx.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_statbox.o: $(srcdir)/src/motif/statbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_dnd_osx.o: $(srcdir)/src/osx/dnd_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/dnd_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_statbox.o: $(srcdir)/src/msw/statbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_statbox.o: $(srcdir)/src/msw/statbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_statbox.o: $(srcdir)/src/osx/carbon/statbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_statbox.o: $(srcdir)/src/osx/cocoa/statbox.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/statbox.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_statbox.o: $(srcdir)/src/cocoa/statbox.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/statbox.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_statbox.o: $(srcdir)/src/os2/statbox.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@coredll_statbox.o: $(srcdir)/src/univ/statbox.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_statline.o: $(srcdir)/src/gtk/statline.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/statline.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_statline.o: $(srcdir)/src/gtk1/statline.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/statline.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_statline.o: $(srcdir)/src/generic/statline.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statline.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_statline.o: $(srcdir)/src/msw/statline.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_statline.o: $(srcdir)/src/msw/statline.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_statline.o: $(srcdir)/src/osx/cocoa/statline.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/statline.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_statline.o: $(srcdir)/src/os2/statline.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/statline.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@coredll_statline.o: $(srcdir)/src/univ/statline.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/statline.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_printdlg_osx.o: $(srcdir)/src/osx/printdlg_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/printdlg_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_printdlg_osx.o: $(srcdir)/src/osx/printdlg_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/printdlg_osx.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/motif/stattext.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_printdlg_osx.o: $(srcdir)/src/osx/printdlg_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/printdlg_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/msw/stattext.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/msw/stattext.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/osx/carbon/stattext.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/osx/cocoa/stattext.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/stattext.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/cocoa/stattext.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/stattext.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_stattext.o: $(srcdir)/src/os2/stattext.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@coredll_stattext.o: $(srcdir)/src/univ/stattext.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/tbargtk.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_tbargtk.o: $(srcdir)/src/gtk1/tbargtk.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/tbargtk.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/textctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/motif/textctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/textctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/osx/carbon/textctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/textctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/osx/cocoa/textctrl.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/textctrl.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/cocoa/textctrl.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/textctrl.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_textctrl.o: $(srcdir)/src/os2/textctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/textctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@coredll_textctrl.o: $(srcdir)/src/univ/textctrl.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/textctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_textentry.o: $(srcdir)/src/gtk/textentry.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/textentry.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_textentry.o: $(srcdir)/src/motif/textentry.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/textentry.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_textentry.o: $(srcdir)/src/msw/textentry.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_textentry.o: $(srcdir)/src/msw/textentry.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_textentry.o: $(srcdir)/src/os2/textentry.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/textentry.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@coredll_tglbtn.o: $(srcdir)/src/gtk/tglbtn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/tglbtn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_tglbtn.o: $(srcdir)/src/gtk1/tglbtn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/tglbtn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_tglbtn.o: $(srcdir)/src/osx/carbon/tglbtn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tglbtn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_tglbtn.o: $(srcdir)/src/osx/cocoa/tglbtn.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/tglbtn.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_tglbtn.o: $(srcdir)/src/os2/tglbtn.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/tglbtn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_textentry_osx.o: $(srcdir)/src/osx/textentry_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/textentry_osx.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@coredll_tglbtn.o: $(srcdir)/src/univ/tglbtn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/tglbtn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_textentry_osx.o: $(srcdir)/src/osx/textentry_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/textentry_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_textentry_osx.o: $(srcdir)/src/osx/textentry_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/textentry_osx.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
  
  
-@COND_USE_GUI_1_WXUNIV_1@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_osx_accel.o: $(srcdir)/src/osx/accel.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_osx_accel.o: $(srcdir)/src/osx/accel.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_osx_accel.o: $(srcdir)/src/osx/accel.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@coredll_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@coredll_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@coredll_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_app.o: $(srcdir)/src/osx/carbon/app.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_app.o: $(srcdir)/src/osx/carbon/app.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@coredll_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_app.o: $(srcdir)/src/osx/carbon/app.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/menuitem.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_menuitem.o: $(srcdir)/src/osx/carbon/menuitem.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/menuitem.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_control.o: $(srcdir)/src/osx/carbon/control.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_menuitem.o: $(srcdir)/src/osx/cocoa/menuitem.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/menuitem.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_control.o: $(srcdir)/src/osx/carbon/control.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_menuitem.o: $(srcdir)/src/cocoa/menuitem.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/menuitem.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_control.o: $(srcdir)/src/osx/carbon/control.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_menuitem.o: $(srcdir)/src/os2/menuitem.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/menuitem.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_toolbar.o: $(srcdir)/src/motif/toolbar.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/toolbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_toolbar.o: $(srcdir)/src/osx/carbon/toolbar.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/toolbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_toolbar.o: $(srcdir)/src/osx/cocoa/toolbar.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/toolbar.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_toolbar.o: $(srcdir)/src/cocoa/toolbar.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/toolbar.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_toolbar.o: $(srcdir)/src/os2/toolbar.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/toolbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@coredll_toolbar.o: $(srcdir)/src/univ/toolbar.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/toolbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_combo.o: $(srcdir)/src/msw/combo.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_combo.o: $(srcdir)/src/msw/combo.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_glgrab.o: $(srcdir)/src/osx/core/glgrab.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/glgrab.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_glgrab.o: $(srcdir)/src/osx/core/glgrab.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/glgrab.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_glgrab.o: $(srcdir)/src/osx/core/glgrab.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/core/glgrab.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_iniconf.o: $(srcdir)/src/os2/iniconf.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/iniconf.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_metafile.o: $(srcdir)/src/msw/metafile.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_metafile.o: $(srcdir)/src/msw/metafile.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_font.o: $(srcdir)/src/osx/carbon/font.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_font.o: $(srcdir)/src/osx/carbon/font.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_metafile.o: $(srcdir)/src/os2/metafile.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/metafile.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_font.o: $(srcdir)/src/osx/carbon/font.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_nativdlg.o: $(srcdir)/src/os2/nativdlg.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/nativdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_access.o: $(srcdir)/src/msw/ole/access.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_access.o: $(srcdir)/src/msw/ole/access.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/ownerdrw.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_tabctrl.o: $(srcdir)/src/osx/carbon/tabctrl.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tabctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_tabctrl.o: $(srcdir)/src/osx/carbon/tabctrl.cpp $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/tabctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_tabctrl.o: $(srcdir)/src/os2/tabctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/tabctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
  
  
-@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) $(srcdir)/src/msw/treectrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
  
  @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(COREDLL_ODEP)
  @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
  
  @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(COREDLL_ODEP)
  @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
@@ -27165,30 +30905,33 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(COREDLL_ODEP)
  @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
  
  @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(COREDLL_ODEP)
  @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
  
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_region.o: $(srcdir)/src/osx/carbon/region.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/region.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_region.o: $(srcdir)/src/osx/carbon/region.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/region.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_region.o: $(srcdir)/src/osx/carbon/region.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/region.cpp
+
  @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(COREDLL_ODEP)
  @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
  
  @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(COREDLL_ODEP)
  
  @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(COREDLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_srchctrl.o: $(srcdir)/src/osx/carbon/srchctrl.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/srchctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_srchctrl.o: $(srcdir)/src/osx/cocoa/srchctrl.mm $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/srchctrl.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_regiong.o: $(srcdir)/src/generic/regiong.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
+@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_regiong.o: $(srcdir)/src/generic/regiong.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_regiong.o: $(srcdir)/src/generic/regiong.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
  
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_regiong.o: $(srcdir)/src/generic/regiong.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
  
-@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) $(srcdir)/src/generic/mdig.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@coredll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
-
  @COND_USE_GUI_1@coredll_accelcmn.o: $(srcdir)/src/common/accelcmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/accelcmn.cpp
  
  @COND_USE_GUI_1@coredll_accelcmn.o: $(srcdir)/src/common/accelcmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/accelcmn.cpp
  
@@ -27198,6 +30941,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@coredll_anidecod.o: $(srcdir)/src/common/anidecod.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/anidecod.cpp
  
  @COND_USE_GUI_1@coredll_anidecod.o: $(srcdir)/src/common/anidecod.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/anidecod.cpp
  
+@COND_USE_GUI_1@coredll_affinematrix2d.o: $(srcdir)/src/common/affinematrix2d.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/affinematrix2d.cpp
+
  @COND_USE_GUI_1@coredll_appcmn.o: $(srcdir)/src/common/appcmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/appcmn.cpp
  
  @COND_USE_GUI_1@coredll_appcmn.o: $(srcdir)/src/common/appcmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/appcmn.cpp
  
@@ -27207,9 +30953,15 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@coredll_artstd.o: $(srcdir)/src/common/artstd.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/artstd.cpp
  
  @COND_USE_GUI_1@coredll_artstd.o: $(srcdir)/src/common/artstd.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/artstd.cpp
  
+@COND_USE_GUI_1@coredll_arttango.o: $(srcdir)/src/common/arttango.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/arttango.cpp
+
  @COND_USE_GUI_1@coredll_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/bmpbase.cpp
  
  @COND_USE_GUI_1@coredll_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/bmpbase.cpp
  
+@COND_USE_GUI_1@coredll_bmpbtncmn.o: $(srcdir)/src/common/bmpbtncmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/bmpbtncmn.cpp
+
  @COND_USE_GUI_1@coredll_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/bookctrl.cpp
  
  @COND_USE_GUI_1@coredll_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/bookctrl.cpp
  
@@ -27219,6 +30971,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@coredll_cairo.o: $(srcdir)/src/common/cairo.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/cairo.cpp
  
  @COND_USE_GUI_1@coredll_cairo.o: $(srcdir)/src/common/cairo.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/cairo.cpp
  
+@COND_USE_GUI_1@coredll_checkboxcmn.o: $(srcdir)/src/common/checkboxcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/checkboxcmn.cpp
+
+@COND_USE_GUI_1@coredll_checklstcmn.o: $(srcdir)/src/common/checklstcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/checklstcmn.cpp
+
  @COND_USE_GUI_1@coredll_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/choiccmn.cpp
  
  @COND_USE_GUI_1@coredll_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/choiccmn.cpp
  
@@ -27231,6 +30989,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@coredll_colourcmn.o: $(srcdir)/src/common/colourcmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/colourcmn.cpp
  
  @COND_USE_GUI_1@coredll_colourcmn.o: $(srcdir)/src/common/colourcmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/colourcmn.cpp
  
+@COND_USE_GUI_1@coredll_colourdata.o: $(srcdir)/src/common/colourdata.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/colourdata.cpp
+
  @COND_USE_GUI_1@coredll_combocmn.o: $(srcdir)/src/common/combocmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/combocmn.cpp
  
  @COND_USE_GUI_1@coredll_combocmn.o: $(srcdir)/src/common/combocmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/combocmn.cpp
  
@@ -27252,9 +31013,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@coredll_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/ctrlsub.cpp
  
  @COND_USE_GUI_1@coredll_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/ctrlsub.cpp
  
-@COND_USE_GUI_1@coredll_datacmn.o: $(srcdir)/src/common/datacmn.cpp $(COREDLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/datacmn.cpp
-
  @COND_USE_GUI_1@coredll_dcbase.o: $(srcdir)/src/common/dcbase.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dcbase.cpp
  
  @COND_USE_GUI_1@coredll_dcbase.o: $(srcdir)/src/common/dcbase.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dcbase.cpp
  
@@ -27267,6 +31025,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@coredll_dcsvg.o: $(srcdir)/src/common/dcsvg.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dcsvg.cpp
  
  @COND_USE_GUI_1@coredll_dcsvg.o: $(srcdir)/src/common/dcsvg.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dcsvg.cpp
  
+@COND_USE_GUI_1@coredll_dirctrlcmn.o: $(srcdir)/src/common/dirctrlcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dirctrlcmn.cpp
+
  @COND_USE_GUI_1@coredll_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp
  
  @COND_USE_GUI_1@coredll_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp
  
@@ -27297,6 +31058,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@coredll_filectrlcmn.o: $(srcdir)/src/common/filectrlcmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/filectrlcmn.cpp
  
  @COND_USE_GUI_1@coredll_filectrlcmn.o: $(srcdir)/src/common/filectrlcmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/filectrlcmn.cpp
  
+@COND_USE_GUI_1@coredll_filehistorycmn.o: $(srcdir)/src/common/filehistorycmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/filehistorycmn.cpp
+
  @COND_USE_GUI_1@coredll_filepickercmn.o: $(srcdir)/src/common/filepickercmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/filepickercmn.cpp
  
  @COND_USE_GUI_1@coredll_filepickercmn.o: $(srcdir)/src/common/filepickercmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/filepickercmn.cpp
  
@@ -27309,6 +31073,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@coredll_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontcmn.cpp
  
  @COND_USE_GUI_1@coredll_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontcmn.cpp
  
+@COND_USE_GUI_1@coredll_fontdata.o: $(srcdir)/src/common/fontdata.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontdata.cpp
+
+@COND_USE_GUI_1@coredll_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp
+
  @COND_USE_GUI_1@coredll_fontenumcmn.o: $(srcdir)/src/common/fontenumcmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontenumcmn.cpp
  
  @COND_USE_GUI_1@coredll_fontenumcmn.o: $(srcdir)/src/common/fontenumcmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontenumcmn.cpp
  
@@ -27339,6 +31109,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@coredll_graphcmn.o: $(srcdir)/src/common/graphcmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/graphcmn.cpp
  
  @COND_USE_GUI_1@coredll_graphcmn.o: $(srcdir)/src/common/graphcmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/graphcmn.cpp
  
+@COND_USE_GUI_1@coredll_headercolcmn.o: $(srcdir)/src/common/headercolcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/headercolcmn.cpp
+
+@COND_USE_GUI_1@coredll_headerctrlcmn.o: $(srcdir)/src/common/headerctrlcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/headerctrlcmn.cpp
+
  @COND_USE_GUI_1@coredll_helpbase.o: $(srcdir)/src/common/helpbase.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/helpbase.cpp
  
  @COND_USE_GUI_1@coredll_helpbase.o: $(srcdir)/src/common/helpbase.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/helpbase.cpp
  
@@ -27393,21 +31169,36 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@coredll_listctrlcmn.o: $(srcdir)/src/common/listctrlcmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/listctrlcmn.cpp
  
  @COND_USE_GUI_1@coredll_listctrlcmn.o: $(srcdir)/src/common/listctrlcmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/listctrlcmn.cpp
  
+@COND_USE_GUI_1@coredll_markupparser.o: $(srcdir)/src/common/markupparser.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/markupparser.cpp
+
  @COND_USE_GUI_1@coredll_matrix.o: $(srcdir)/src/common/matrix.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/matrix.cpp
  
  @COND_USE_GUI_1@coredll_menucmn.o: $(srcdir)/src/common/menucmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/menucmn.cpp
  
  @COND_USE_GUI_1@coredll_matrix.o: $(srcdir)/src/common/matrix.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/matrix.cpp
  
  @COND_USE_GUI_1@coredll_menucmn.o: $(srcdir)/src/common/menucmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/menucmn.cpp
  
+@COND_USE_GUI_1@coredll_mousemanager.o: $(srcdir)/src/common/mousemanager.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/mousemanager.cpp
+
  @COND_USE_GUI_1@coredll_nbkbase.o: $(srcdir)/src/common/nbkbase.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/nbkbase.cpp
  
  @COND_USE_GUI_1@coredll_overlaycmn.o: $(srcdir)/src/common/overlaycmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/overlaycmn.cpp
  
  @COND_USE_GUI_1@coredll_nbkbase.o: $(srcdir)/src/common/nbkbase.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/nbkbase.cpp
  
  @COND_USE_GUI_1@coredll_overlaycmn.o: $(srcdir)/src/common/overlaycmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/overlaycmn.cpp
  
+@COND_USE_GUI_1@coredll_ownerdrwcmn.o: $(srcdir)/src/common/ownerdrwcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/ownerdrwcmn.cpp
+
  @COND_USE_GUI_1@coredll_paper.o: $(srcdir)/src/common/paper.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/paper.cpp
  
  @COND_USE_GUI_1@coredll_paper.o: $(srcdir)/src/common/paper.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/paper.cpp
  
+@COND_USE_GUI_1@coredll_panelcmn.o: $(srcdir)/src/common/panelcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/panelcmn.cpp
+
+@COND_USE_GUI_1@coredll_persist.o: $(srcdir)/src/common/persist.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/persist.cpp
+
  @COND_USE_GUI_1@coredll_pickerbase.o: $(srcdir)/src/common/pickerbase.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/pickerbase.cpp
  
  @COND_USE_GUI_1@coredll_pickerbase.o: $(srcdir)/src/common/pickerbase.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/pickerbase.cpp
  
@@ -27420,27 +31211,54 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@coredll_quantize.o: $(srcdir)/src/common/quantize.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/quantize.cpp
  
  @COND_USE_GUI_1@coredll_quantize.o: $(srcdir)/src/common/quantize.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/quantize.cpp
  
+@COND_USE_GUI_1@coredll_radiobtncmn.o: $(srcdir)/src/common/radiobtncmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/radiobtncmn.cpp
+
  @COND_USE_GUI_1@coredll_radiocmn.o: $(srcdir)/src/common/radiocmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/radiocmn.cpp
  
  @COND_USE_GUI_1@coredll_radiocmn.o: $(srcdir)/src/common/radiocmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/radiocmn.cpp
  
+@COND_USE_GUI_1@coredll_rearrangectrl.o: $(srcdir)/src/common/rearrangectrl.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/rearrangectrl.cpp
+
  @COND_USE_GUI_1@coredll_rendcmn.o: $(srcdir)/src/common/rendcmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/rendcmn.cpp
  
  @COND_USE_GUI_1@coredll_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/rgncmn.cpp
  
  @COND_USE_GUI_1@coredll_rendcmn.o: $(srcdir)/src/common/rendcmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/rendcmn.cpp
  
  @COND_USE_GUI_1@coredll_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/rgncmn.cpp
  
+@COND_USE_GUI_1@coredll_scrolbarcmn.o: $(srcdir)/src/common/scrolbarcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/scrolbarcmn.cpp
+
  @COND_USE_GUI_1@coredll_settcmn.o: $(srcdir)/src/common/settcmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/settcmn.cpp
  
  @COND_USE_GUI_1@coredll_sizer.o: $(srcdir)/src/common/sizer.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
  
  @COND_USE_GUI_1@coredll_settcmn.o: $(srcdir)/src/common/settcmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/settcmn.cpp
  
  @COND_USE_GUI_1@coredll_sizer.o: $(srcdir)/src/common/sizer.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
  
+@COND_USE_GUI_1@coredll_slidercmn.o: $(srcdir)/src/common/slidercmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/slidercmn.cpp
+
+@COND_USE_GUI_1@coredll_spinbtncmn.o: $(srcdir)/src/common/spinbtncmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/spinbtncmn.cpp
+
+@COND_USE_GUI_1@coredll_spinctrlcmn.o: $(srcdir)/src/common/spinctrlcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/spinctrlcmn.cpp
+
  @COND_USE_GUI_1@coredll_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp
  
  @COND_USE_GUI_1@coredll_statbar.o: $(srcdir)/src/common/statbar.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/statbar.cpp
  
  @COND_USE_GUI_1@coredll_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp
  
  @COND_USE_GUI_1@coredll_statbar.o: $(srcdir)/src/common/statbar.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/statbar.cpp
  
+@COND_USE_GUI_1@coredll_statbmpcmn.o: $(srcdir)/src/common/statbmpcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/statbmpcmn.cpp
+
+@COND_USE_GUI_1@coredll_statboxcmn.o: $(srcdir)/src/common/statboxcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/statboxcmn.cpp
+
+@COND_USE_GUI_1@coredll_statlinecmn.o: $(srcdir)/src/common/statlinecmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/statlinecmn.cpp
+
  @COND_USE_GUI_1@coredll_stattextcmn.o: $(srcdir)/src/common/stattextcmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/stattextcmn.cpp
  
  @COND_USE_GUI_1@coredll_stattextcmn.o: $(srcdir)/src/common/stattextcmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/stattextcmn.cpp
  
@@ -27462,6 +31280,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@coredll_treebase.o: $(srcdir)/src/common/treebase.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/treebase.cpp
  
  @COND_USE_GUI_1@coredll_treebase.o: $(srcdir)/src/common/treebase.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/treebase.cpp
  
+@COND_USE_GUI_1@coredll_uiactioncmn.o: $(srcdir)/src/common/uiactioncmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/uiactioncmn.cpp
+
  @COND_USE_GUI_1@coredll_valgen.o: $(srcdir)/src/common/valgen.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/valgen.cpp
  
  @COND_USE_GUI_1@coredll_valgen.o: $(srcdir)/src/common/valgen.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/valgen.cpp
  
@@ -27471,6 +31292,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@coredll_valtext.o: $(srcdir)/src/common/valtext.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/valtext.cpp
  
  @COND_USE_GUI_1@coredll_valtext.o: $(srcdir)/src/common/valtext.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/valtext.cpp
  
+@COND_USE_GUI_1@coredll_valnum.o: $(srcdir)/src/common/valnum.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/valnum.cpp
+
  @COND_USE_GUI_1@coredll_wincmn.o: $(srcdir)/src/common/wincmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/wincmn.cpp
  
  @COND_USE_GUI_1@coredll_wincmn.o: $(srcdir)/src/common/wincmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/wincmn.cpp
  
@@ -27510,12 +31334,24 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@coredll_filectrlg.o: $(srcdir)/src/generic/filectrlg.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filectrlg.cpp
  
  @COND_USE_GUI_1@coredll_filectrlg.o: $(srcdir)/src/generic/filectrlg.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/filectrlg.cpp
  
+@COND_USE_GUI_1@coredll_headerctrlg.o: $(srcdir)/src/generic/headerctrlg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/headerctrlg.cpp
+
+@COND_USE_GUI_1@coredll_generic_infobar.o: $(srcdir)/src/generic/infobar.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/infobar.cpp
+
  @COND_USE_GUI_1@coredll_listbkg.o: $(srcdir)/src/generic/listbkg.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listbkg.cpp
  
  @COND_USE_GUI_1@coredll_logg.o: $(srcdir)/src/generic/logg.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/logg.cpp
  
  @COND_USE_GUI_1@coredll_listbkg.o: $(srcdir)/src/generic/listbkg.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listbkg.cpp
  
  @COND_USE_GUI_1@coredll_logg.o: $(srcdir)/src/generic/logg.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/logg.cpp
  
+@COND_USE_GUI_1@coredll_markuptext.o: $(srcdir)/src/generic/markuptext.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/markuptext.cpp
+
+@COND_USE_GUI_1@coredll_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
+
  @COND_USE_GUI_1@coredll_numdlgg.o: $(srcdir)/src/generic/numdlgg.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/numdlgg.cpp
  
  @COND_USE_GUI_1@coredll_numdlgg.o: $(srcdir)/src/generic/numdlgg.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/numdlgg.cpp
  
@@ -27531,6 +31367,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@coredll_renderg.o: $(srcdir)/src/generic/renderg.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/renderg.cpp
  
  @COND_USE_GUI_1@coredll_renderg.o: $(srcdir)/src/generic/renderg.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/renderg.cpp
  
+@COND_USE_GUI_1@coredll_richmsgdlgg.o: $(srcdir)/src/generic/richmsgdlgg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/richmsgdlgg.cpp
+
  @COND_USE_GUI_1@coredll_scrlwing.o: $(srcdir)/src/generic/scrlwing.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/scrlwing.cpp
  
  @COND_USE_GUI_1@coredll_scrlwing.o: $(srcdir)/src/generic/scrlwing.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/scrlwing.cpp
  
@@ -27549,6 +31388,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@coredll_statbmpg.o: $(srcdir)/src/generic/statbmpg.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statbmpg.cpp
  
  @COND_USE_GUI_1@coredll_statbmpg.o: $(srcdir)/src/generic/statbmpg.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/statbmpg.cpp
  
+@COND_USE_GUI_1@coredll_stattextg.o: $(srcdir)/src/generic/stattextg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/stattextg.cpp
+
  @COND_USE_GUI_1@coredll_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp
  
  @COND_USE_GUI_1@coredll_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp
  
@@ -27582,56 +31424,437 @@ corelib_msgout.o: $(srcdir)/src/common/msgout.cpp $(CORELIB_ODEP)
  corelib_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/utilscmn.cpp
  
  corelib_utilscmn.o: $(srcdir)/src/common/utilscmn.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/utilscmn.cpp
  
+corelib_msw_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
+
+corelib_msw_main.o: $(srcdir)/src/msw/main.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/main.cpp
+
  corelib_mslu.o: $(srcdir)/src/msw/mslu.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/mslu.cpp
  
  corelib_volume.o: $(srcdir)/src/msw/volume.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/volume.cpp
  
  corelib_mslu.o: $(srcdir)/src/msw/mslu.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/mslu.cpp
  
  corelib_volume.o: $(srcdir)/src/msw/volume.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/volume.cpp
  
+corelib_carbon_utils.o: $(srcdir)/src/osx/carbon/utils.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/utils.cpp
+
  corelib_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/uma.cpp
  
  corelib_uma.o: $(srcdir)/src/osx/carbon/uma.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/uma.cpp
  
-corelib_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp
+corelib_osx_cocoa_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm
+
+corelib_gtk_anybutton.o: $(srcdir)/src/gtk/anybutton.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/anybutton.cpp
  
  corelib_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp
  
  
  corelib_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp
  
+corelib_gtk_bmpbuttn.o: $(srcdir)/src/gtk/bmpbuttn.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/bmpbuttn.cpp
+
+corelib_gtk_button.o: $(srcdir)/src/gtk/button.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/button.cpp
+
+corelib_gtk_checkbox.o: $(srcdir)/src/gtk/checkbox.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/checkbox.cpp
+
+corelib_gtk_checklst.o: $(srcdir)/src/gtk/checklst.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/checklst.cpp
+
+corelib_gtk_choice.o: $(srcdir)/src/gtk/choice.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/choice.cpp
+
  corelib_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp
  
  corelib_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp
  
+corelib_gtk_colordlg.o: $(srcdir)/src/gtk/colordlg.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/colordlg.cpp
+
+corelib_gtk_combobox.o: $(srcdir)/src/gtk/combobox.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/combobox.cpp
+
+corelib_gtk_control.o: $(srcdir)/src/gtk/control.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/control.cpp
+
  corelib_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp
  
  corelib_clrpicker.o: $(srcdir)/src/gtk/clrpicker.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/clrpicker.cpp
  
+corelib_gtk_dialog.o: $(srcdir)/src/gtk/dialog.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dialog.cpp
+
  corelib_fontpicker.o: $(srcdir)/src/gtk/fontpicker.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/fontpicker.cpp
  
  corelib_filepicker.o: $(srcdir)/src/gtk/filepicker.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/filepicker.cpp
  
  corelib_fontpicker.o: $(srcdir)/src/gtk/fontpicker.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/fontpicker.cpp
  
  corelib_filepicker.o: $(srcdir)/src/gtk/filepicker.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/filepicker.cpp
  
+corelib_gtk_dirdlg.o: $(srcdir)/src/gtk/dirdlg.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dirdlg.cpp
+
+corelib_gtk_filedlg.o: $(srcdir)/src/gtk/filedlg.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/filedlg.cpp
+
+corelib_gtk_fontdlg.o: $(srcdir)/src/gtk/fontdlg.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/fontdlg.cpp
+
+corelib_gtk_frame.o: $(srcdir)/src/gtk/frame.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/frame.cpp
+
+corelib_gtk_gauge.o: $(srcdir)/src/gtk/gauge.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/gauge.cpp
+
  corelib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/gnome/gprint.cpp
  
  corelib_gvfs.o: $(srcdir)/src/gtk/gnome/gvfs.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/gnome/gvfs.cpp
  
  corelib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/gnome/gprint.cpp
  
  corelib_gvfs.o: $(srcdir)/src/gtk/gnome/gvfs.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/gnome/gvfs.cpp
  
-corelib_mnemonics.o: $(srcdir)/src/gtk/mnemonics.cpp $(CORELIB_ODEP)
+corelib_gtk_infobar.o: $(srcdir)/src/gtk/infobar.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/infobar.cpp
+
+corelib_gtk_listbox.o: $(srcdir)/src/gtk/listbox.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/listbox.cpp
+
+corelib_gtk_mdi.o: $(srcdir)/src/gtk/mdi.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/mdi.cpp
+
+corelib_gtk_menu.o: $(srcdir)/src/gtk/menu.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/menu.cpp
+
+corelib_gtk_mnemonics.o: $(srcdir)/src/gtk/mnemonics.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/mnemonics.cpp
  
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/mnemonics.cpp
  
-corelib_treeentry_gtk.o: $(srcdir)/src/gtk/treeentry_gtk.c $(CORELIB_ODEP)
-       $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/gtk/treeentry_gtk.c
+corelib_gtk_msgdlg.o: $(srcdir)/src/gtk/msgdlg.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/msgdlg.cpp
+
+corelib_gtk_nativewin.o: $(srcdir)/src/gtk/nativewin.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/nativewin.cpp
+
+corelib_gtk_notebook.o: $(srcdir)/src/gtk/notebook.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/notebook.cpp
+
+corelib_gtk_print.o: $(srcdir)/src/gtk/print.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/print.cpp
+
+corelib_gtk_radiobox.o: $(srcdir)/src/gtk/radiobox.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/radiobox.cpp
+
+corelib_gtk_radiobut.o: $(srcdir)/src/gtk/radiobut.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/radiobut.cpp
+
+corelib_gtk_scrolbar.o: $(srcdir)/src/gtk/scrolbar.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/scrolbar.cpp
+
+corelib_gtk_scrolwin.o: $(srcdir)/src/gtk/scrolwin.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/scrolwin.cpp
+
+corelib_gtk_slider.o: $(srcdir)/src/gtk/slider.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/slider.cpp
+
+corelib_gtk_spinbutt.o: $(srcdir)/src/gtk/spinbutt.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/spinbutt.cpp
+
+corelib_gtk_spinctrl.o: $(srcdir)/src/gtk/spinctrl.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/spinctrl.cpp
+
+corelib_gtk_statbmp.o: $(srcdir)/src/gtk/statbmp.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/statbmp.cpp
+
+corelib_gtk_statbox.o: $(srcdir)/src/gtk/statbox.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/statbox.cpp
+
+corelib_gtk_statline.o: $(srcdir)/src/gtk/statline.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/statline.cpp
+
+corelib_gtk_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/stattext.cpp
+
+corelib_gtk_toolbar.o: $(srcdir)/src/gtk/toolbar.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/toolbar.cpp
+
+corelib_gtk_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/textctrl.cpp
+
+corelib_gtk_textentry.o: $(srcdir)/src/gtk/textentry.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/textentry.cpp
+
+corelib_gtk_tglbtn.o: $(srcdir)/src/gtk/tglbtn.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/tglbtn.cpp
+
+corelib_treeentry_gtk.o: $(srcdir)/src/gtk/treeentry_gtk.c $(CORELIB_ODEP)
+       $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/gtk/treeentry_gtk.c
+
+corelib_gtk1_bmpbuttn.o: $(srcdir)/src/gtk1/bmpbuttn.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/bmpbuttn.cpp
+
+corelib_gtk1_button.o: $(srcdir)/src/gtk1/button.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/button.cpp
+
+corelib_gtk1_checkbox.o: $(srcdir)/src/gtk1/checkbox.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/checkbox.cpp
+
+corelib_gtk1_checklst.o: $(srcdir)/src/gtk1/checklst.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/checklst.cpp
+
+corelib_gtk1_choice.o: $(srcdir)/src/gtk1/choice.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/choice.cpp
+
+corelib_gtk1_combobox.o: $(srcdir)/src/gtk1/combobox.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/combobox.cpp
+
+corelib_gtk1_control.o: $(srcdir)/src/gtk1/control.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/control.cpp
+
+corelib_gtk1_dialog.o: $(srcdir)/src/gtk1/dialog.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/dialog.cpp
+
+corelib_gtk1_filedlg.o: $(srcdir)/src/gtk1/filedlg.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/filedlg.cpp
+
+corelib_gtk1_fontdlg.o: $(srcdir)/src/gtk1/fontdlg.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/fontdlg.cpp
+
+corelib_gtk1_frame.o: $(srcdir)/src/gtk1/frame.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/frame.cpp
+
+corelib_gtk1_gauge.o: $(srcdir)/src/gtk1/gauge.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/gauge.cpp
+
+corelib_gtk1_listbox.o: $(srcdir)/src/gtk1/listbox.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/listbox.cpp
+
+corelib_gtk1_mdi.o: $(srcdir)/src/gtk1/mdi.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/mdi.cpp
+
+corelib_gtk1_menu.o: $(srcdir)/src/gtk1/menu.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/menu.cpp
+
+corelib_gtk1_mnemonics.o: $(srcdir)/src/gtk1/mnemonics.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/mnemonics.cpp
+
+corelib_gtk1_notebook.o: $(srcdir)/src/gtk1/notebook.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/notebook.cpp
+
+corelib_gtk1_radiobox.o: $(srcdir)/src/gtk1/radiobox.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/radiobox.cpp
+
+corelib_gtk1_radiobut.o: $(srcdir)/src/gtk1/radiobut.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/radiobut.cpp
+
+corelib_gtk1_scrolbar.o: $(srcdir)/src/gtk1/scrolbar.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/scrolbar.cpp
+
+corelib_gtk1_scrolwin.o: $(srcdir)/src/gtk1/scrolwin.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/scrolwin.cpp
+
+corelib_gtk1_slider.o: $(srcdir)/src/gtk1/slider.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/slider.cpp
+
+corelib_gtk1_spinbutt.o: $(srcdir)/src/gtk1/spinbutt.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/spinbutt.cpp
+
+corelib_gtk1_spinctrl.o: $(srcdir)/src/gtk1/spinctrl.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/spinctrl.cpp
+
+corelib_gtk1_statbmp.o: $(srcdir)/src/gtk1/statbmp.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/statbmp.cpp
+
+corelib_gtk1_statbox.o: $(srcdir)/src/gtk1/statbox.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/statbox.cpp
+
+corelib_gtk1_statline.o: $(srcdir)/src/gtk1/statline.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/statline.cpp
+
+corelib_gtk1_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp
+
+corelib_gtk1_toolbar.o: $(srcdir)/src/gtk1/toolbar.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/toolbar.cpp
+
+corelib_gtk1_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp
+
+corelib_gtk1_tglbtn.o: $(srcdir)/src/gtk1/tglbtn.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/tglbtn.cpp
+
+corelib_motif_accel.o: $(srcdir)/src/motif/accel.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/accel.cpp
+
+corelib_motif_app.o: $(srcdir)/src/motif/app.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/app.cpp
+
+corelib_motif_bmpbuttn.o: $(srcdir)/src/motif/bmpbuttn.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/bmpbuttn.cpp
+
+corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/bmpmotif.cpp
+
+corelib_motif_button.o: $(srcdir)/src/motif/button.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/button.cpp
+
+corelib_motif_checkbox.o: $(srcdir)/src/motif/checkbox.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/checkbox.cpp
+
+corelib_motif_checklst.o: $(srcdir)/src/motif/checklst.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/checklst.cpp
+
+corelib_motif_choice.o: $(srcdir)/src/motif/choice.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/choice.cpp
+
+corelib_motif_clipbrd.o: $(srcdir)/src/motif/clipbrd.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/clipbrd.cpp
+
+corelib_motif_colour.o: $(srcdir)/src/motif/colour.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/colour.cpp
+
+corelib_motif_combobox.o: $(srcdir)/src/motif/combobox.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/combobox.cpp
+
+corelib_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/combobox_native.cpp
+
+corelib_motif_control.o: $(srcdir)/src/motif/control.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/control.cpp
+
+corelib_motif_cursor.o: $(srcdir)/src/motif/cursor.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/cursor.cpp
+
+corelib_motif_data.o: $(srcdir)/src/motif/data.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/data.cpp
+
+corelib_motif_dataobj.o: $(srcdir)/src/motif/dataobj.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dataobj.cpp
+
+corelib_motif_dc.o: $(srcdir)/src/motif/dc.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dc.cpp
+
+corelib_motif_dcclient.o: $(srcdir)/src/motif/dcclient.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dcclient.cpp
+
+corelib_motif_dcmemory.o: $(srcdir)/src/motif/dcmemory.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dcmemory.cpp
+
+corelib_motif_dcscreen.o: $(srcdir)/src/motif/dcscreen.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dcscreen.cpp
+
+corelib_motif_dialog.o: $(srcdir)/src/motif/dialog.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dialog.cpp
+
+corelib_motif_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/evtloop.cpp
+
+corelib_motif_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/filedlg.cpp
+
+corelib_motif_font.o: $(srcdir)/src/motif/font.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/font.cpp
+
+corelib_motif_frame.o: $(srcdir)/src/motif/frame.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/frame.cpp
+
+corelib_motif_gauge.o: $(srcdir)/src/motif/gauge.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp
+
+corelib_sockmot.o: $(srcdir)/src/motif/sockmot.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/sockmot.cpp
+
+corelib_motif_icon.o: $(srcdir)/src/motif/icon.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/icon.cpp
+
+corelib_motif_listbox.o: $(srcdir)/src/motif/listbox.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/listbox.cpp
+
+corelib_motif_main.o: $(srcdir)/src/motif/main.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/main.cpp
+
+corelib_motif_menu.o: $(srcdir)/src/motif/menu.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/menu.cpp
+
+corelib_motif_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/menuitem.cpp
+
+corelib_motif_minifram.o: $(srcdir)/src/motif/minifram.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/minifram.cpp
+
+corelib_motif_msgdlg.o: $(srcdir)/src/motif/msgdlg.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/msgdlg.cpp
+
+corelib_motif_popupwin.o: $(srcdir)/src/motif/popupwin.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/popupwin.cpp
+
+corelib_motif_radiobox.o: $(srcdir)/src/motif/radiobox.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/radiobox.cpp
+
+corelib_motif_radiobut.o: $(srcdir)/src/motif/radiobut.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/radiobut.cpp
+
+corelib_motif_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/scrolbar.cpp
+
+corelib_motif_settings.o: $(srcdir)/src/motif/settings.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/settings.cpp
+
+corelib_motif_slider.o: $(srcdir)/src/motif/slider.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/slider.cpp
+
+corelib_motif_spinbutt.o: $(srcdir)/src/motif/spinbutt.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/spinbutt.cpp
+
+corelib_motif_statbmp.o: $(srcdir)/src/motif/statbmp.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/statbmp.cpp
+
+corelib_motif_statbox.o: $(srcdir)/src/motif/statbox.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/statbox.cpp
+
+corelib_motif_stattext.o: $(srcdir)/src/motif/stattext.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/stattext.cpp
+
+corelib_motif_textctrl.o: $(srcdir)/src/motif/textctrl.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/textctrl.cpp
+
+corelib_motif_textentry.o: $(srcdir)/src/motif/textentry.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/textentry.cpp
+
+corelib_motif_timer.o: $(srcdir)/src/motif/timer.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/timer.cpp
+
+corelib_motif_toolbar.o: $(srcdir)/src/motif/toolbar.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/toolbar.cpp
+
+corelib_motif_toplevel.o: $(srcdir)/src/motif/toplevel.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/toplevel.cpp
+
+corelib_motif_utils.o: $(srcdir)/src/motif/utils.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/utils.cpp
+
+corelib_motif_window.o: $(srcdir)/src/motif/window.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/window.cpp
+
+corelib_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(CORELIB_ODEP)
+       $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/motif/xmcombo/xmcombo.c
+
+corelib_generic_notebook.o: $(srcdir)/src/generic/notebook.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/notebook.cpp
+
+corelib_generic_statline.o: $(srcdir)/src/generic/statline.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statline.cpp
+
+corelib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
  
  
-corelib_bmpmotif.o: $(srcdir)/src/motif/bmpmotif.cpp $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/bmpmotif.cpp
+corelib_msw_checklst.o: $(srcdir)/src/msw/checklst.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp
  
  
-corelib_combobox_native.o: $(srcdir)/src/motif/combobox_native.cpp $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/combobox_native.cpp
+corelib_msw_fdrepdlg.o: $(srcdir)/src/msw/fdrepdlg.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/fdrepdlg.cpp
  
  
-corelib_gsockmot.o: $(srcdir)/src/motif/gsockmot.cpp $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/gsockmot.cpp
+corelib_msw_fontdlg.o: $(srcdir)/src/msw/fontdlg.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/fontdlg.cpp
  
  
-corelib_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(CORELIB_ODEP)
-       $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/motif/xmcombo/xmcombo.c
+corelib_wince_checklst.o: $(srcdir)/src/msw/wince/checklst.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/wince/checklst.cpp
  
  corelib_choicece.o: $(srcdir)/src/msw/wince/choicece.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/wince/choicece.cpp
  
  corelib_choicece.o: $(srcdir)/src/msw/wince/choicece.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/wince/choicece.cpp
@@ -27657,1244 +31880,1268 @@ corelib_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(CORELIB_ODEP)
  corelib_textctrlce.o: $(srcdir)/src/msw/wince/textctrlce.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/wince/textctrlce.cpp
  
  corelib_textctrlce.o: $(srcdir)/src/msw/wince/textctrlce.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/wince/textctrlce.cpp
  
-corelib_listctrl_mac.o: $(srcdir)/src/osx/carbon/listctrl_mac.cpp $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/listctrl_mac.cpp
+corelib_carbon_anybutton.o: $(srcdir)/src/osx/carbon/anybutton.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/anybutton.cpp
  
  
-corelib_notebmac.o: $(srcdir)/src/osx/carbon/notebmac.cpp $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/notebmac.cpp
+corelib_carbon_bmpbuttn.o: $(srcdir)/src/osx/carbon/bmpbuttn.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/bmpbuttn.cpp
  
  
-corelib_statlmac.o: $(srcdir)/src/osx/carbon/statlmac.cpp $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statlmac.cpp
+corelib_carbon_button.o: $(srcdir)/src/osx/carbon/button.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/button.cpp
  
  
-corelib_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm
+corelib_carbon_checkbox.o: $(srcdir)/src/osx/carbon/checkbox.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/checkbox.cpp
  
  
-corelib_glcanvas.o: $(srcdir)/src/osx/cocoa/glcanvas.mm $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/glcanvas.mm
+corelib_carbon_choice.o: $(srcdir)/src/osx/carbon/choice.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/choice.cpp
  
  
-corelib_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSBox.mm
+corelib_carbon_colordlg.o: $(srcdir)/src/osx/carbon/colordlg.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlg.cpp
  
  
-corelib_NSButton.o: $(srcdir)/src/cocoa/NSButton.mm $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSButton.mm
+corelib_carbon_dialog.o: $(srcdir)/src/osx/carbon/dialog.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dialog.cpp
  
  
-corelib_NSControl.o: $(srcdir)/src/cocoa/NSControl.mm $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSControl.mm
+corelib_carbon_dirdlg.o: $(srcdir)/src/osx/carbon/dirdlg.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dirdlg.cpp
  
  
-corelib_NSMenu.o: $(srcdir)/src/cocoa/NSMenu.mm $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSMenu.mm
+corelib_carbon_dnd.o: $(srcdir)/src/osx/carbon/dnd.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dnd.cpp
  
  
-corelib_NSPanel.o: $(srcdir)/src/cocoa/NSPanel.mm $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSPanel.mm
+corelib_carbon_evtloop.o: $(srcdir)/src/osx/carbon/evtloop.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/evtloop.cpp
  
  
-corelib_NSScroller.o: $(srcdir)/src/cocoa/NSScroller.mm $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSScroller.mm
+corelib_carbon_filedlg.o: $(srcdir)/src/osx/carbon/filedlg.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/filedlg.cpp
  
  
-corelib_NSSlider.o: $(srcdir)/src/cocoa/NSSlider.mm $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSSlider.mm
+corelib_carbon_gauge.o: $(srcdir)/src/osx/carbon/gauge.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gauge.cpp
  
  
-corelib_NSTabView.o: $(srcdir)/src/cocoa/NSTabView.mm $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSTabView.mm
+corelib_carbon_listbox.o: $(srcdir)/src/osx/carbon/listbox.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/listbox.cpp
  
  
-corelib_NSTableView.o: $(srcdir)/src/cocoa/NSTableView.mm $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSTableView.mm
+corelib_listctrl_mac.o: $(srcdir)/src/osx/carbon/listctrl_mac.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/listctrl_mac.cpp
  
  
-corelib_NSTextField.o: $(srcdir)/src/cocoa/NSTextField.mm $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSTextField.mm
+corelib_carbon_menu.o: $(srcdir)/src/osx/carbon/menu.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/menu.cpp
  
  
-corelib_NSView.o: $(srcdir)/src/cocoa/NSView.mm $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSView.mm
+corelib_carbon_menuitem.o: $(srcdir)/src/osx/carbon/menuitem.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/menuitem.cpp
  
  
-corelib_NSWindow.o: $(srcdir)/src/cocoa/NSWindow.mm $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/NSWindow.mm
+corelib_carbon_msgdlg.o: $(srcdir)/src/osx/carbon/msgdlg.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/msgdlg.cpp
  
  
-corelib_ObjcRef.o: $(srcdir)/src/cocoa/ObjcRef.mm $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/ObjcRef.mm
+corelib_carbon_nonownedwnd.o: $(srcdir)/src/osx/carbon/nonownedwnd.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/nonownedwnd.cpp
  
  
-corelib_drawer.o: $(srcdir)/src/cocoa/drawer.mm $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/drawer.mm
+corelib_notebmac.o: $(srcdir)/src/osx/carbon/notebmac.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/notebmac.cpp
  
  
-corelib_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/mbarman.mm
+corelib_carbon_printdlg.o: $(srcdir)/src/osx/carbon/printdlg.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/printdlg.cpp
  
  
-corelib_sound.o: $(srcdir)/src/cocoa/sound.mm $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/sound.mm
+corelib_carbon_radiobut.o: $(srcdir)/src/osx/carbon/radiobut.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/radiobut.cpp
  
  
-corelib_statline2.o: $(srcdir)/src/cocoa/statline2.mm $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/statline2.mm
+corelib_carbon_scrolbar.o: $(srcdir)/src/osx/carbon/scrolbar.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/scrolbar.cpp
  
  
-corelib_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.mm $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/utilsexc.mm
+corelib_carbon_slider.o: $(srcdir)/src/osx/carbon/slider.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/slider.cpp
  
  
-corelib_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/gsockpm.cpp
+corelib_carbon_spinbutt.o: $(srcdir)/src/osx/carbon/spinbutt.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/spinbutt.cpp
  
  
-corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/ctrlrend.cpp
+corelib_carbon_srchctrl.o: $(srcdir)/src/osx/carbon/srchctrl.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/srchctrl.cpp
  
  
-corelib_framuniv.o: $(srcdir)/src/univ/framuniv.cpp $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/framuniv.cpp
+corelib_carbon_statbmp.o: $(srcdir)/src/osx/carbon/statbmp.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbmp.cpp
  
  
-corelib_inpcons.o: $(srcdir)/src/univ/inpcons.cpp $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/inpcons.cpp
+corelib_carbon_statbox.o: $(srcdir)/src/osx/carbon/statbox.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbox.cpp
  
  
-corelib_inphand.o: $(srcdir)/src/univ/inphand.cpp $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/inphand.cpp
+corelib_statlmac.o: $(srcdir)/src/osx/carbon/statlmac.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statlmac.cpp
  
  
-corelib_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/scrarrow.cpp
+corelib_carbon_stattext.o: $(srcdir)/src/osx/carbon/stattext.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/stattext.cpp
  
  
-corelib_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/scrthumb.cpp
+corelib_carbon_textctrl.o: $(srcdir)/src/osx/carbon/textctrl.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/textctrl.cpp
  
  
-corelib_settingsuniv.o: $(srcdir)/src/univ/settingsuniv.cpp $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/settingsuniv.cpp
+corelib_carbon_tglbtn.o: $(srcdir)/src/osx/carbon/tglbtn.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tglbtn.cpp
  
  
-corelib_stdrend.o: $(srcdir)/src/univ/stdrend.cpp $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/stdrend.cpp
+corelib_carbon_toolbar.o: $(srcdir)/src/osx/carbon/toolbar.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/toolbar.cpp
  
  
-corelib_theme.o: $(srcdir)/src/univ/theme.cpp $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/theme.cpp
+corelib_carbon_tooltip.o: $(srcdir)/src/osx/carbon/tooltip.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tooltip.cpp
  
  
-corelib_topluniv.o: $(srcdir)/src/univ/topluniv.cpp $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/topluniv.cpp
+corelib_carbon_window.o: $(srcdir)/src/osx/carbon/window.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/window.cpp
  
  
-corelib_winuniv.o: $(srcdir)/src/univ/winuniv.cpp $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/winuniv.cpp
+corelib_cocoa_anybutton.o: $(srcdir)/src/osx/cocoa/anybutton.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/anybutton.mm
  
  
-corelib_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/themes/gtk.cpp
+corelib_osx_cocoa_button.o: $(srcdir)/src/osx/cocoa/button.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/button.mm
  
  
-corelib_metal.o: $(srcdir)/src/univ/themes/metal.cpp $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/themes/metal.cpp
+corelib_osx_cocoa_checkbox.o: $(srcdir)/src/osx/cocoa/checkbox.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/checkbox.mm
  
  
-corelib_mono.o: $(srcdir)/src/univ/themes/mono.cpp $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/themes/mono.cpp
+corelib_osx_cocoa_choice.o: $(srcdir)/src/osx/cocoa/choice.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/choice.mm
  
  
-corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/themes/win32.cpp
+corelib_osx_cocoa_colour.o: $(srcdir)/src/osx/cocoa/colour.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/colour.mm
  
  
-@COND_PLATFORM_WIN32_1@corelib_evtloop.o: $(srcdir)/src/msw/evtloop.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/evtloop.cpp
+corelib_osx_cocoa_combobox.o: $(srcdir)/src/osx/cocoa/combobox.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/combobox.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/evtloop.cpp
+corelib_osx_cocoa_dialog.o: $(srcdir)/src/osx/cocoa/dialog.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dialog.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/gtk1/evtloop.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/evtloop.cpp
+corelib_osx_cocoa_dirdlg.o: $(srcdir)/src/osx/cocoa/dirdlg.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dirdlg.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/x11/evtloop.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/evtloop.cpp
+corelib_cocoa_dnd.o: $(srcdir)/src/osx/cocoa/dnd.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dnd.mm
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/evtloop.cpp
+corelib_osx_cocoa_evtloop.o: $(srcdir)/src/osx/cocoa/evtloop.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/evtloop.mm
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/dfb/evtloop.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/evtloop.cpp
+corelib_osx_cocoa_filedlg.o: $(srcdir)/src/osx/cocoa/filedlg.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/filedlg.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_evtloop.o: $(srcdir)/src/motif/evtloop.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/evtloop.cpp
+corelib_osx_cocoa_gauge.o: $(srcdir)/src/osx/cocoa/gauge.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/gauge.mm
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_evtloop.o: $(srcdir)/src/osx/carbon/evtloop.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/evtloop.cpp
+corelib_osx_cocoa_listbox.o: $(srcdir)/src/osx/cocoa/listbox.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/listbox.mm
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_evtloop.o: $(srcdir)/src/osx/cocoa/evtloop.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/evtloop.mm
+corelib_osx_cocoa_menu.o: $(srcdir)/src/osx/cocoa/menu.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/menu.mm
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/evtloop.mm
+corelib_osx_cocoa_menuitem.o: $(srcdir)/src/osx/cocoa/menuitem.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/menuitem.mm
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_evtloop.o: $(srcdir)/src/os2/evtloop.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/evtloop.cpp
+corelib_osx_cocoa_msgdlg.o: $(srcdir)/src/osx/cocoa/msgdlg.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/msgdlg.mm
  
  
-@COND_PLATFORM_WIN32_1@corelib_main.o: $(srcdir)/src/msw/main.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_WIN32_1@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/main.cpp
+corelib_cocoa_nonownedwnd.o: $(srcdir)/src/osx/cocoa/nonownedwnd.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/nonownedwnd.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_main.o: $(srcdir)/src/gtk1/main.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/main.cpp
+corelib_osx_cocoa_notebook.o: $(srcdir)/src/osx/cocoa/notebook.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/notebook.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_main.o: $(srcdir)/src/motif/main.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/main.cpp
+corelib_osx_cocoa_radiobut.o: $(srcdir)/src/osx/cocoa/radiobut.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/radiobut.mm
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_main.o: $(srcdir)/src/cocoa/main.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/main.cpp
+corelib_cocoa_printdlg.o: $(srcdir)/src/osx/cocoa/printdlg.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/printdlg.mm
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_main.o: $(srcdir)/src/os2/main.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/main.cpp
+corelib_osx_cocoa_scrolbar.o: $(srcdir)/src/osx/cocoa/scrolbar.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/scrolbar.mm
  
  
-@COND_TOOLKIT_OSX_CARBON@corelib_utils.o: $(srcdir)/src/osx/carbon/utils.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/utils.cpp
+corelib_osx_cocoa_slider.o: $(srcdir)/src/osx/cocoa/slider.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/slider.mm
  
  
-@COND_TOOLKIT_OSX_COCOA@corelib_utils.o: $(srcdir)/src/osx/cocoa/utils.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/utils.mm
+corelib_osx_cocoa_spinbutt.o: $(srcdir)/src/osx/cocoa/spinbutt.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/spinbutt.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_utils.o: $(srcdir)/src/x11/utils.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/utils.cpp
+corelib_cocoa_srchctrl.o: $(srcdir)/src/osx/cocoa/srchctrl.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/srchctrl.mm
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_utils.o: $(srcdir)/src/mgl/utils.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/utils.cpp
+corelib_osx_cocoa_statbox.o: $(srcdir)/src/osx/cocoa/statbox.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/statbox.mm
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_utils.o: $(srcdir)/src/dfb/utils.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/utils.cpp
+corelib_cocoa_statline.o: $(srcdir)/src/osx/cocoa/statline.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/statline.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_utils.o: $(srcdir)/src/motif/utils.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/utils.cpp
+corelib_osx_cocoa_stattext.o: $(srcdir)/src/osx/cocoa/stattext.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/stattext.mm
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_utils.o: $(srcdir)/src/cocoa/utils.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/utils.mm
+corelib_osx_cocoa_textctrl.o: $(srcdir)/src/osx/cocoa/textctrl.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/textctrl.mm
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+corelib_cocoa_tglbtn.o: $(srcdir)/src/osx/cocoa/tglbtn.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/tglbtn.mm
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+corelib_osx_cocoa_toolbar.o: $(srcdir)/src/osx/cocoa/toolbar.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/toolbar.mm
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+corelib_osx_cocoa_tooltip.o: $(srcdir)/src/osx/cocoa/tooltip.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/tooltip.mm
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+corelib_osx_cocoa_window.o: $(srcdir)/src/osx/cocoa/window.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/window.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+corelib_iphone_anybutton.o: $(srcdir)/src/osx/iphone/anybutton.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/anybutton.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+corelib_iphone_button.o: $(srcdir)/src/osx/iphone/button.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/button.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+corelib_iphone_checkbox.o: $(srcdir)/src/osx/iphone/checkbox.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/checkbox.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+corelib_iphone_dialog.o: $(srcdir)/src/osx/iphone/dialog.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/dialog.mm
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+corelib_iphone_evtloop.o: $(srcdir)/src/osx/iphone/evtloop.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/evtloop.mm
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
+corelib_iphone_gauge.o: $(srcdir)/src/osx/iphone/gauge.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/gauge.mm
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_caret.o: $(srcdir)/src/msw/caret.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
+corelib_iphone_msgdlg.o: $(srcdir)/src/osx/iphone/msgdlg.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/msgdlg.mm
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_caret.o: $(srcdir)/src/msw/caret.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
+corelib_iphone_nonownedwnd.o: $(srcdir)/src/osx/iphone/nonownedwnd.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/nonownedwnd.mm
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+corelib_iphone_scrolbar.o: $(srcdir)/src/osx/iphone/scrolbar.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/scrolbar.mm
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+corelib_iphone_slider.o: $(srcdir)/src/osx/iphone/slider.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/slider.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+corelib_iphone_stattext.o: $(srcdir)/src/osx/iphone/stattext.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/stattext.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+corelib_iphone_textctrl.o: $(srcdir)/src/osx/iphone/textctrl.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/textctrl.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+corelib_iphone_toolbar.o: $(srcdir)/src/osx/iphone/toolbar.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/toolbar.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+corelib_iphone_utils.o: $(srcdir)/src/osx/iphone/utils.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/utils.mm
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+corelib_iphone_window.o: $(srcdir)/src/osx/iphone/window.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/window.mm
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
+corelib_NSBox.o: $(srcdir)/src/cocoa/NSBox.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSBox.mm
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
+corelib_NSButton.o: $(srcdir)/src/cocoa/NSButton.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSButton.mm
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
+corelib_NSControl.o: $(srcdir)/src/cocoa/NSControl.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSControl.mm
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
+corelib_NSMenu.o: $(srcdir)/src/cocoa/NSMenu.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSMenu.mm
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
+corelib_NSPanel.o: $(srcdir)/src/cocoa/NSPanel.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSPanel.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+corelib_NSScroller.o: $(srcdir)/src/cocoa/NSScroller.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSScroller.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+corelib_NSSlider.o: $(srcdir)/src/cocoa/NSSlider.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSSlider.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+corelib_NSTabView.o: $(srcdir)/src/cocoa/NSTabView.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSTabView.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
+corelib_NSTableView.o: $(srcdir)/src/cocoa/NSTableView.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSTableView.mm
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_dialup.o: $(srcdir)/src/msw/dialup.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
+corelib_NSTextField.o: $(srcdir)/src/cocoa/NSTextField.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSTextField.mm
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_dialup.o: $(srcdir)/src/msw/dialup.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
+corelib_NSView.o: $(srcdir)/src/cocoa/NSView.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSView.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
+corelib_NSWindow.o: $(srcdir)/src/cocoa/NSWindow.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/NSWindow.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
+corelib_ObjcRef.o: $(srcdir)/src/cocoa/ObjcRef.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/ObjcRef.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
+corelib_cocoa_app.o: $(srcdir)/src/cocoa/app.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/app.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
+corelib_cocoa_bitmap.o: $(srcdir)/src/cocoa/bitmap.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/bitmap.mm
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
+corelib_cocoa_bmpbuttn.o: $(srcdir)/src/cocoa/bmpbuttn.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/bmpbuttn.mm
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
+corelib_cocoa_brush.o: $(srcdir)/src/cocoa/brush.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/brush.mm
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
+corelib_src_cocoa_button.o: $(srcdir)/src/cocoa/button.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/button.mm
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
+corelib_src_cocoa_checkbox.o: $(srcdir)/src/cocoa/checkbox.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/checkbox.mm
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_fontenum.o: $(srcdir)/src/mgl/fontenum.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/fontenum.cpp
+corelib_cocoa_checklst.o: $(srcdir)/src/cocoa/checklst.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/checklst.mm
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_fontenum.o: $(srcdir)/src/dfb/fontenum.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/fontenum.cpp
+corelib_src_cocoa_choice.o: $(srcdir)/src/cocoa/choice.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/choice.mm
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontenum.o: $(srcdir)/src/cocoa/fontenum.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/fontenum.mm
+corelib_cocoa_clipbrd.o: $(srcdir)/src/cocoa/clipbrd.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/clipbrd.mm
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_fontenum.o: $(srcdir)/src/os2/fontenum.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/fontenum.cpp
+corelib_cocoa_colordlg.o: $(srcdir)/src/cocoa/colordlg.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/colordlg.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
+corelib_src_cocoa_colour.o: $(srcdir)/src/cocoa/colour.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/colour.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
+corelib_src_cocoa_combobox.o: $(srcdir)/src/cocoa/combobox.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/combobox.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
+corelib_cocoa_control.o: $(srcdir)/src/cocoa/control.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/control.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
+corelib_cocoa_cursor.o: $(srcdir)/src/cocoa/cursor.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/cursor.mm
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
+corelib_cocoa_data.o: $(srcdir)/src/cocoa/data.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/data.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
+corelib_cocoa_dataobj.o: $(srcdir)/src/cocoa/dataobj.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/dataobj.mm
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
+corelib_cocoa_dc.o: $(srcdir)/src/cocoa/dc.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/dc.mm
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
+corelib_cocoa_dcclient.o: $(srcdir)/src/cocoa/dcclient.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/dcclient.mm
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_fontutil.o: $(srcdir)/src/mgl/fontutil.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/fontutil.cpp
+corelib_cocoa_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/dcmemory.mm
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontutil.o: $(srcdir)/src/cocoa/fontutil.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/fontutil.cpp
+corelib_cocoa_dcscreen.o: $(srcdir)/src/cocoa/dcscreen.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/dcscreen.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_fontutil.o: $(srcdir)/src/os2/fontutil.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/fontutil.cpp
+corelib_src_cocoa_dialog.o: $(srcdir)/src/cocoa/dialog.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/dialog.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
+corelib_src_cocoa_dirdlg.o: $(srcdir)/src/cocoa/dirdlg.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/dirdlg.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
+corelib_cocoa_display.o: $(srcdir)/src/cocoa/display.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/display.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
+corelib_drawer.o: $(srcdir)/src/cocoa/drawer.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/drawer.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
+corelib_src_cocoa_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/evtloop.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+corelib_src_cocoa_filedlg.o: $(srcdir)/src/cocoa/filedlg.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/filedlg.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+corelib_cocoa_font.o: $(srcdir)/src/cocoa/font.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/font.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+corelib_cocoa_fontdlg.o: $(srcdir)/src/cocoa/fontdlg.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/fontdlg.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
+corelib_cocoa_fontenum.o: $(srcdir)/src/cocoa/fontenum.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/fontenum.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+corelib_cocoa_fontutil.o: $(srcdir)/src/cocoa/fontutil.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/fontutil.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+corelib_cocoa_frame.o: $(srcdir)/src/cocoa/frame.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/frame.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+corelib_src_cocoa_gauge.o: $(srcdir)/src/cocoa/gauge.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/gauge.mm
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+corelib_cocoa_icon.o: $(srcdir)/src/cocoa/icon.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/icon.mm
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
+corelib_src_cocoa_listbox.o: $(srcdir)/src/cocoa/listbox.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/listbox.mm
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_icon.o: $(srcdir)/src/msw/icon.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
+corelib_cocoa_main.o: $(srcdir)/src/cocoa/main.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/main.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_icon.o: $(srcdir)/src/msw/icon.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
+corelib_mbarman.o: $(srcdir)/src/cocoa/mbarman.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/mbarman.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_icon.o: $(srcdir)/src/motif/icon.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/icon.cpp
+corelib_cocoa_mdi.o: $(srcdir)/src/cocoa/mdi.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/mdi.mm
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
+corelib_src_cocoa_menu.o: $(srcdir)/src/cocoa/menu.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/menu.mm
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
+corelib_src_cocoa_menuitem.o: $(srcdir)/src/cocoa/menuitem.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/menuitem.mm
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_icon.o: $(srcdir)/src/cocoa/icon.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/icon.mm
+corelib_src_cocoa_msgdlg.o: $(srcdir)/src/cocoa/msgdlg.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/msgdlg.mm
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_icon.o: $(srcdir)/src/os2/icon.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/icon.cpp
+corelib_src_cocoa_notebook.o: $(srcdir)/src/cocoa/notebook.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/notebook.mm
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
+corelib_cocoa_pen.o: $(srcdir)/src/cocoa/pen.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/pen.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
+corelib_cocoa_radiobox.o: $(srcdir)/src/cocoa/radiobox.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/radiobox.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
+corelib_src_cocoa_radiobut.o: $(srcdir)/src/cocoa/radiobut.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/radiobut.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_app.o: $(srcdir)/src/gtk/app.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/app.cpp
+corelib_cocoa_region.o: $(srcdir)/src/cocoa/region.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/region.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_app.o: $(srcdir)/src/gtk1/app.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/app.cpp
+corelib_src_cocoa_scrolbar.o: $(srcdir)/src/cocoa/scrolbar.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/scrolbar.mm
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_app.o: $(srcdir)/src/msw/app.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/app.cpp
+corelib_cocoa_settings.o: $(srcdir)/src/cocoa/settings.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/settings.mm
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_app.o: $(srcdir)/src/msw/app.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/app.cpp
+corelib_src_cocoa_slider.o: $(srcdir)/src/cocoa/slider.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/slider.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_app.o: $(srcdir)/src/x11/app.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/app.cpp
+corelib_sound.o: $(srcdir)/src/cocoa/sound.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/sound.mm
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_app.o: $(srcdir)/src/mgl/app.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/app.cpp
+corelib_src_cocoa_spinbutt.o: $(srcdir)/src/cocoa/spinbutt.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/spinbutt.mm
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_app.o: $(srcdir)/src/dfb/app.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/app.cpp
+corelib_cocoa_statbmp.o: $(srcdir)/src/cocoa/statbmp.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/statbmp.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_app.o: $(srcdir)/src/motif/app.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/app.cpp
+corelib_src_cocoa_statbox.o: $(srcdir)/src/cocoa/statbox.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/statbox.mm
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_app.o: $(srcdir)/src/osx/carbon/app.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
+corelib_statline2.o: $(srcdir)/src/cocoa/statline2.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/statline2.mm
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_app.o: $(srcdir)/src/osx/carbon/app.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
+corelib_src_cocoa_stattext.o: $(srcdir)/src/cocoa/stattext.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/stattext.mm
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_app.o: $(srcdir)/src/cocoa/app.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/app.mm
+corelib_src_cocoa_textctrl.o: $(srcdir)/src/cocoa/textctrl.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/textctrl.mm
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_app.o: $(srcdir)/src/os2/app.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/app.cpp
+corelib_cocoa_timer.o: $(srcdir)/src/cocoa/timer.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/timer.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.c $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.c
+corelib_src_cocoa_toolbar.o: $(srcdir)/src/cocoa/toolbar.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/toolbar.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/bitmap.cpp
+corelib_src_cocoa_tooltip.o: $(srcdir)/src/cocoa/tooltip.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/tooltip.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/gtk1/bitmap.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/bitmap.cpp
+corelib_cocoa_toplevel.o: $(srcdir)/src/cocoa/toplevel.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/toplevel.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
+corelib_src_cocoa_utils.o: $(srcdir)/src/cocoa/utils.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/utils.mm
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
+corelib_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/utilsexc.mm
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
+corelib_src_cocoa_window.o: $(srcdir)/src/cocoa/window.mm $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/window.mm
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
+corelib_os2_accel.o: $(srcdir)/src/os2/accel.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/accel.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
+corelib_os2_app.o: $(srcdir)/src/os2/app.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/app.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
+corelib_os2_bitmap.o: $(srcdir)/src/os2/bitmap.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/bitmap.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/bitmap.cpp
+corelib_os2_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/bmpbuttn.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_bitmap.o: $(srcdir)/src/dfb/bitmap.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/bitmap.cpp
+corelib_os2_brush.o: $(srcdir)/src/os2/brush.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/brush.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_bitmap.o: $(srcdir)/src/cocoa/bitmap.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/bitmap.mm
+corelib_os2_button.o: $(srcdir)/src/os2/button.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/button.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_bitmap.o: $(srcdir)/src/os2/bitmap.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/bitmap.cpp
+corelib_os2_checkbox.o: $(srcdir)/src/os2/checkbox.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/checkbox.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_brush.o: $(srcdir)/src/gtk/brush.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/brush.cpp
+corelib_os2_checklst.o: $(srcdir)/src/os2/checklst.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/checklst.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_brush.o: $(srcdir)/src/gtk1/brush.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/brush.cpp
+corelib_os2_choice.o: $(srcdir)/src/os2/choice.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/choice.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_brush.o: $(srcdir)/src/x11/brush.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
+corelib_os2_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/clipbrd.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_brush.o: $(srcdir)/src/x11/brush.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
+corelib_os2_colour.o: $(srcdir)/src/os2/colour.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/colour.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_brush.o: $(srcdir)/src/msw/brush.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
+corelib_os2_combobox.o: $(srcdir)/src/os2/combobox.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/combobox.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_brush.o: $(srcdir)/src/msw/brush.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
+corelib_os2_control.o: $(srcdir)/src/os2/control.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/control.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_brush.o: $(srcdir)/src/osx/brush.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
+corelib_os2_cursor.o: $(srcdir)/src/os2/cursor.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/cursor.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_brush.o: $(srcdir)/src/osx/brush.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
+corelib_os2_data.o: $(srcdir)/src/os2/data.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/data.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_brush.o: $(srcdir)/src/mgl/brush.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/brush.cpp
+corelib_os2_dataobj.o: $(srcdir)/src/os2/dataobj.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dataobj.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_brush.o: $(srcdir)/src/dfb/brush.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/brush.cpp
+corelib_os2_dc.o: $(srcdir)/src/os2/dc.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dc.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_brush.o: $(srcdir)/src/cocoa/brush.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/brush.mm
+corelib_os2_dcclient.o: $(srcdir)/src/os2/dcclient.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dcclient.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_brush.o: $(srcdir)/src/os2/brush.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/brush.cpp
+corelib_os2_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dcmemory.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_clipbrd.o: $(srcdir)/src/gtk/clipbrd.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/clipbrd.cpp
+corelib_os2_dcprint.o: $(srcdir)/src/os2/dcprint.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dcprint.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_clipbrd.o: $(srcdir)/src/gtk1/clipbrd.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/clipbrd.cpp
+corelib_os2_dcscreen.o: $(srcdir)/src/os2/dcscreen.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dcscreen.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
+corelib_os2_dialog.o: $(srcdir)/src/os2/dialog.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dialog.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
+corelib_os2_dnd.o: $(srcdir)/src/os2/dnd.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dnd.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_clipbrd.o: $(srcdir)/src/x11/clipbrd.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/clipbrd.cpp
+corelib_os2_evtloop.o: $(srcdir)/src/os2/evtloop.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/evtloop.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_clipbrd.o: $(srcdir)/src/mgl/clipbrd.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/clipbrd.cpp
+corelib_os2_filedlg.o: $(srcdir)/src/os2/filedlg.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/filedlg.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_clipbrd.o: $(srcdir)/src/motif/clipbrd.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/clipbrd.cpp
+corelib_os2_font.o: $(srcdir)/src/os2/font.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/font.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
+corelib_os2_fontdlg.o: $(srcdir)/src/os2/fontdlg.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/fontdlg.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
+corelib_os2_fontenum.o: $(srcdir)/src/os2/fontenum.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/fontenum.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_clipbrd.o: $(srcdir)/src/cocoa/clipbrd.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/clipbrd.mm
+corelib_os2_fontutil.o: $(srcdir)/src/os2/fontutil.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/fontutil.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_clipbrd.o: $(srcdir)/src/os2/clipbrd.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/clipbrd.cpp
+corelib_os2_frame.o: $(srcdir)/src/os2/frame.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/frame.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_colour.o: $(srcdir)/src/gtk/colour.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/colour.cpp
+corelib_os2_gauge.o: $(srcdir)/src/os2/gauge.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/gauge.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_colour.o: $(srcdir)/src/gtk1/colour.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/colour.cpp
+corelib_os2_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/gdiimage.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_colour.o: $(srcdir)/src/msw/colour.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
+corelib_sockpm.o: $(srcdir)/src/os2/sockpm.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/sockpm.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_colour.o: $(srcdir)/src/msw/colour.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
+corelib_os2_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/helpwin.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_colour.o: $(srcdir)/src/osx/core/colour.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
+corelib_os2_icon.o: $(srcdir)/src/os2/icon.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/icon.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_colour.o: $(srcdir)/src/osx/core/colour.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
+corelib_os2_iniconf.o: $(srcdir)/src/os2/iniconf.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/iniconf.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_colour.o: $(srcdir)/src/x11/colour.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/colour.cpp
+corelib_os2_listbox.o: $(srcdir)/src/os2/listbox.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/listbox.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_colour.o: $(srcdir)/src/generic/colour.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
+corelib_os2_main.o: $(srcdir)/src/os2/main.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/main.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_colour.o: $(srcdir)/src/generic/colour.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
+corelib_os2_menu.o: $(srcdir)/src/os2/menu.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/menu.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_colour.o: $(srcdir)/src/motif/colour.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/colour.cpp
+corelib_os2_menuitem.o: $(srcdir)/src/os2/menuitem.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/menuitem.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_colour.o: $(srcdir)/src/cocoa/colour.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/colour.mm
+corelib_os2_metafile.o: $(srcdir)/src/os2/metafile.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/metafile.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_colour.o: $(srcdir)/src/os2/colour.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/colour.cpp
+corelib_os2_minifram.o: $(srcdir)/src/os2/minifram.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/minifram.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_cursor.o: $(srcdir)/src/gtk/cursor.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/cursor.cpp
+corelib_os2_msgdlg.o: $(srcdir)/src/os2/msgdlg.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/msgdlg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_cursor.o: $(srcdir)/src/gtk1/cursor.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/cursor.cpp
+corelib_os2_nativdlg.o: $(srcdir)/src/os2/nativdlg.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/nativdlg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_cursor.o: $(srcdir)/src/msw/cursor.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
+corelib_os2_notebook.o: $(srcdir)/src/os2/notebook.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/notebook.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_cursor.o: $(srcdir)/src/msw/cursor.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
+corelib_os2_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/ownerdrw.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_cursor.o: $(srcdir)/src/x11/cursor.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/cursor.cpp
+corelib_os2_palette.o: $(srcdir)/src/os2/palette.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/palette.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_cursor.o: $(srcdir)/src/mgl/cursor.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/cursor.cpp
+corelib_os2_pen.o: $(srcdir)/src/os2/pen.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/pen.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_cursor.o: $(srcdir)/src/dfb/cursor.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/cursor.cpp
+corelib_os2_popupwin.o: $(srcdir)/src/os2/popupwin.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/popupwin.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_cursor.o: $(srcdir)/src/motif/cursor.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/cursor.cpp
+corelib_os2_print.o: $(srcdir)/src/os2/print.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/print.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
+corelib_os2_radiobox.o: $(srcdir)/src/os2/radiobox.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/radiobox.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
+corelib_os2_radiobut.o: $(srcdir)/src/os2/radiobut.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/radiobut.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_cursor.o: $(srcdir)/src/cocoa/cursor.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/cursor.mm
+corelib_os2_region.o: $(srcdir)/src/os2/region.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/region.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_cursor.o: $(srcdir)/src/os2/cursor.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/cursor.cpp
+corelib_os2_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/scrolbar.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_dataobj.o: $(srcdir)/src/gtk/dataobj.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dataobj.cpp
+corelib_os2_settings.o: $(srcdir)/src/os2/settings.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/settings.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_dataobj.o: $(srcdir)/src/gtk1/dataobj.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/dataobj.cpp
+corelib_os2_slider.o: $(srcdir)/src/os2/slider.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/slider.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
+corelib_os2_spinbutt.o: $(srcdir)/src/os2/spinbutt.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/spinbutt.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
+corelib_os2_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/spinctrl.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_dataobj.o: $(srcdir)/src/x11/dataobj.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/dataobj.cpp
+corelib_os2_statbmp.o: $(srcdir)/src/os2/statbmp.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/statbmp.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_dataobj.o: $(srcdir)/src/motif/dataobj.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dataobj.cpp
+corelib_os2_statbox.o: $(srcdir)/src/os2/statbox.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/statbox.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
+corelib_os2_statline.o: $(srcdir)/src/os2/statline.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/statline.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
+corelib_os2_stattext.o: $(srcdir)/src/os2/stattext.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/stattext.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_dataobj.o: $(srcdir)/src/cocoa/dataobj.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/dataobj.mm
+corelib_os2_textctrl.o: $(srcdir)/src/os2/textctrl.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/textctrl.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dataobj.o: $(srcdir)/src/os2/dataobj.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dataobj.cpp
+corelib_os2_textentry.o: $(srcdir)/src/os2/textentry.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/textentry.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_dc.o: $(srcdir)/src/gtk/dc.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dc.cpp
+corelib_os2_tglbtn.o: $(srcdir)/src/os2/tglbtn.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/tglbtn.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_dc.o: $(srcdir)/src/gtk1/dc.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/dc.cpp
+corelib_os2_timer.o: $(srcdir)/src/os2/timer.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/timer.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_dc.o: $(srcdir)/src/msw/dc.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
+corelib_os2_toolbar.o: $(srcdir)/src/os2/toolbar.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/toolbar.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_dc.o: $(srcdir)/src/msw/dc.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
+corelib_os2_tooltip.o: $(srcdir)/src/os2/tooltip.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/tooltip.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_dc.o: $(srcdir)/src/x11/dc.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/dc.cpp
+corelib_os2_toplevel.o: $(srcdir)/src/os2/toplevel.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/toplevel.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_dc.o: $(srcdir)/src/mgl/dc.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/dc.cpp
+corelib_os2_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/utilsgui.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dc.o: $(srcdir)/src/dfb/dc.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/dc.cpp
+corelib_os2_window.o: $(srcdir)/src/os2/window.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/window.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_dc.o: $(srcdir)/src/motif/dc.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dc.cpp
+corelib_univ_bmpbuttn.o: $(srcdir)/src/univ/bmpbuttn.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/bmpbuttn.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_dc.o: $(srcdir)/src/cocoa/dc.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/dc.mm
+corelib_univ_button.o: $(srcdir)/src/univ/button.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/button.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dc.o: $(srcdir)/src/os2/dc.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dc.cpp
+corelib_univ_checkbox.o: $(srcdir)/src/univ/checkbox.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/checkbox.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_dcclient.o: $(srcdir)/src/gtk/dcclient.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dcclient.cpp
+corelib_univ_checklst.o: $(srcdir)/src/univ/checklst.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/checklst.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_dcclient.o: $(srcdir)/src/gtk1/dcclient.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/dcclient.cpp
+corelib_univ_choice.o: $(srcdir)/src/univ/choice.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/choice.cpp
+
+corelib_univ_combobox.o: $(srcdir)/src/univ/combobox.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/combobox.cpp
+
+corelib_univ_control.o: $(srcdir)/src/univ/control.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/control.cpp
+
+corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/ctrlrend.cpp
+
+corelib_univ_dialog.o: $(srcdir)/src/univ/dialog.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/dialog.cpp
+
+corelib_framuniv.o: $(srcdir)/src/univ/framuniv.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/framuniv.cpp
+
+corelib_univ_gauge.o: $(srcdir)/src/univ/gauge.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/gauge.cpp
+
+corelib_inpcons.o: $(srcdir)/src/univ/inpcons.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/inpcons.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
+corelib_inphand.o: $(srcdir)/src/univ/inphand.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/inphand.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
+corelib_univ_listbox.o: $(srcdir)/src/univ/listbox.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/listbox.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_dcclient.o: $(srcdir)/src/x11/dcclient.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/dcclient.cpp
+corelib_univ_menu.o: $(srcdir)/src/univ/menu.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/menu.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/dcclient.cpp
+corelib_univ_notebook.o: $(srcdir)/src/univ/notebook.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/notebook.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dcclient.o: $(srcdir)/src/dfb/dcclient.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/dcclient.cpp
+corelib_univ_radiobox.o: $(srcdir)/src/univ/radiobox.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/radiobox.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_dcclient.o: $(srcdir)/src/motif/dcclient.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dcclient.cpp
+corelib_univ_radiobut.o: $(srcdir)/src/univ/radiobut.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/radiobut.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
+corelib_scrarrow.o: $(srcdir)/src/univ/scrarrow.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/scrarrow.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
+corelib_univ_scrolbar.o: $(srcdir)/src/univ/scrolbar.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/scrolbar.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_dcclient.o: $(srcdir)/src/cocoa/dcclient.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/dcclient.mm
+corelib_scrthumb.o: $(srcdir)/src/univ/scrthumb.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/scrthumb.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dcclient.o: $(srcdir)/src/os2/dcclient.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dcclient.cpp
+corelib_settingsuniv.o: $(srcdir)/src/univ/settingsuniv.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/settingsuniv.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_dcmemory.o: $(srcdir)/src/gtk/dcmemory.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dcmemory.cpp
+corelib_univ_slider.o: $(srcdir)/src/univ/slider.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/slider.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_dcmemory.o: $(srcdir)/src/gtk1/dcmemory.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/dcmemory.cpp
+corelib_univ_spinbutt.o: $(srcdir)/src/univ/spinbutt.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/spinbutt.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
+corelib_univ_statbmp.o: $(srcdir)/src/univ/statbmp.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/statbmp.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
+corelib_univ_statbox.o: $(srcdir)/src/univ/statbox.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/statbox.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
+corelib_univ_statline.o: $(srcdir)/src/univ/statline.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/statline.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
+corelib_univ_stattext.o: $(srcdir)/src/univ/stattext.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/stattext.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_dcmemory.o: $(srcdir)/src/x11/dcmemory.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/dcmemory.cpp
+corelib_univ_statusbr.o: $(srcdir)/src/univ/statusbr.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/statusbr.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/dcmemory.cpp
+corelib_stdrend.o: $(srcdir)/src/univ/stdrend.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/stdrend.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dcmemory.o: $(srcdir)/src/dfb/dcmemory.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/dcmemory.cpp
+corelib_univ_textctrl.o: $(srcdir)/src/univ/textctrl.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/textctrl.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_dcmemory.o: $(srcdir)/src/motif/dcmemory.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dcmemory.cpp
+corelib_univ_tglbtn.o: $(srcdir)/src/univ/tglbtn.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/tglbtn.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_dcmemory.o: $(srcdir)/src/cocoa/dcmemory.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/dcmemory.mm
+corelib_theme.o: $(srcdir)/src/univ/theme.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/theme.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dcmemory.o: $(srcdir)/src/os2/dcmemory.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dcmemory.cpp
+corelib_univ_toolbar.o: $(srcdir)/src/univ/toolbar.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/toolbar.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_dcscreen.o: $(srcdir)/src/gtk/dcscreen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dcscreen.cpp
+corelib_topluniv.o: $(srcdir)/src/univ/topluniv.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/topluniv.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_dcscreen.o: $(srcdir)/src/gtk1/dcscreen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/dcscreen.cpp
+corelib_winuniv.o: $(srcdir)/src/univ/winuniv.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/winuniv.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
+corelib_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/themes/gtk.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
+corelib_metal.o: $(srcdir)/src/univ/themes/metal.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/themes/metal.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_dcscreen.o: $(srcdir)/src/x11/dcscreen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/dcscreen.cpp
+corelib_mono.o: $(srcdir)/src/univ/themes/mono.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/themes/mono.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_dcscreen.o: $(srcdir)/src/mgl/dcscreen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/dcscreen.cpp
+corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/themes/win32.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dcscreen.o: $(srcdir)/src/dfb/dcscreen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/dcscreen.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_dcscreen.o: $(srcdir)/src/motif/dcscreen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dcscreen.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_dcscreen.o: $(srcdir)/src/cocoa/dcscreen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/dcscreen.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dcscreen.o: $(srcdir)/src/os2/dcscreen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dcscreen.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_dnd.o: $(srcdir)/src/gtk/dnd.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dnd.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_dnd.o: $(srcdir)/src/gtk1/dnd.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/dnd.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_dnd.o: $(srcdir)/src/osx/carbon/dnd.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dnd.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_dnd.o: $(srcdir)/src/osx/carbon/dnd.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dnd.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dnd.o: $(srcdir)/src/os2/dnd.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dnd.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_generic_caret.o: $(srcdir)/src/generic/caret.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/caret.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_filectrl.o: $(srcdir)/src/gtk/filectrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/filectrl.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_font.o: $(srcdir)/src/gtk/font.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/font.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_font.o: $(srcdir)/src/gtk1/font.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/font.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_font.o: $(srcdir)/src/msw/font.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/font.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_font.o: $(srcdir)/src/msw/font.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/font.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_font.o: $(srcdir)/src/x11/font.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/font.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_font.o: $(srcdir)/src/mgl/font.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/font.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_font.o: $(srcdir)/src/dfb/font.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/font.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_generic_imaglist.o: $(srcdir)/src/generic/imaglist.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/imaglist.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_font.o: $(srcdir)/src/motif/font.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/font.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_font.o: $(srcdir)/src/osx/carbon/font.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_font.o: $(srcdir)/src/osx/carbon/font.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_font.o: $(srcdir)/src/cocoa/font.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/font.mm
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_unix_dialup.o: $(srcdir)/src/unix/dialup.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/dialup.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_font.o: $(srcdir)/src/os2/font.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/font.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/gsockgtk.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gsockgtk.o: $(srcdir)/src/gtk1/gsockgtk.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/gsockgtk.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_minifram.o: $(srcdir)/src/gtk/minifram.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/minifram.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/displayx11.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_minifram.o: $(srcdir)/src/gtk1/minifram.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/minifram.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_minifram.o: $(srcdir)/src/msw/minifram.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_minifram.o: $(srcdir)/src/msw/minifram.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_minifram.o: $(srcdir)/src/osx/minifram.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_unix_fontenum.o: $(srcdir)/src/unix/fontenum.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontenum.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_minifram.o: $(srcdir)/src/osx/minifram.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_minifram.o: $(srcdir)/src/x11/minifram.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/minifram.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_minifram.o: $(srcdir)/src/motif/minifram.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/minifram.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_minifram.o: $(srcdir)/src/os2/minifram.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/minifram.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_unix_fontutil.o: $(srcdir)/src/unix/fontutil.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/fontutil.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_pen.o: $(srcdir)/src/gtk/pen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/pen.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_uiactionx11.o: $(srcdir)/src/unix/uiactionx11.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/uiactionx11.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_pen.o: $(srcdir)/src/gtk1/pen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/pen.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_uiactionx11.o: $(srcdir)/src/unix/uiactionx11.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/uiactionx11.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_pen.o: $(srcdir)/src/x11/pen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_uiactionx11.o: $(srcdir)/src/unix/uiactionx11.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/uiactionx11.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_pen.o: $(srcdir)/src/x11/pen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_uiactionx11.o: $(srcdir)/src/unix/uiactionx11.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/uiactionx11.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_pen.o: $(srcdir)/src/msw/pen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_pen.o: $(srcdir)/src/msw/pen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_pen.o: $(srcdir)/src/osx/pen.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_pen.o: $(srcdir)/src/osx/pen.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_utilsx11.o: $(srcdir)/src/unix/utilsx11.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/utilsx11.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_pen.o: $(srcdir)/src/mgl/pen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/pen.cpp
+@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_pen.o: $(srcdir)/src/dfb/pen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/pen.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_pen.o: $(srcdir)/src/cocoa/pen.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/pen.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_pen.o: $(srcdir)/src/os2/pen.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/pen.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_popupwin.o: $(srcdir)/src/gtk/popupwin.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/popupwin.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_popupwin.o: $(srcdir)/src/gtk1/popupwin.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/popupwin.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_generic_icon.o: $(srcdir)/src/generic/icon.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/icon.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_popupwin.o: $(srcdir)/src/x11/popupwin.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/popupwin.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_paletteg.o: $(srcdir)/src/generic/paletteg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/paletteg.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_popupwin.o: $(srcdir)/src/motif/popupwin.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/popupwin.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_app.o: $(srcdir)/src/gtk/app.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/app.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/bitmap.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_popupwin.o: $(srcdir)/src/os2/popupwin.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/popupwin.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_brush.o: $(srcdir)/src/gtk/brush.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/brush.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_private.o: $(srcdir)/src/gtk/private.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/private.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_clipbrd.o: $(srcdir)/src/gtk/clipbrd.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/clipbrd.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_region.o: $(srcdir)/src/gtk/region.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/region.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_colour.o: $(srcdir)/src/gtk/colour.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/colour.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_region.o: $(srcdir)/src/gtk1/region.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/region.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_cursor.o: $(srcdir)/src/gtk/cursor.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/cursor.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_region.o: $(srcdir)/src/x11/region.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/region.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_dataobj.o: $(srcdir)/src/gtk/dataobj.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dataobj.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_region.o: $(srcdir)/src/x11/region.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/region.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_dc.o: $(srcdir)/src/gtk/dc.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dc.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_region.o: $(srcdir)/src/msw/region.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/region.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_dcclient.o: $(srcdir)/src/gtk/dcclient.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dcclient.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_region.o: $(srcdir)/src/msw/region.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/region.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_dcmemory.o: $(srcdir)/src/gtk/dcmemory.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dcmemory.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_region.o: $(srcdir)/src/mgl/region.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/region.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_dcscreen.o: $(srcdir)/src/gtk/dcscreen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dcscreen.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_region.o: $(srcdir)/src/dfb/region.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/region.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_dnd.o: $(srcdir)/src/gtk/dnd.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dnd.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_region.o: $(srcdir)/src/osx/carbon/region.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/region.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/evtloop.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_region.o: $(srcdir)/src/cocoa/region.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/region.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_filectrl.o: $(srcdir)/src/gtk/filectrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/filectrl.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_region.o: $(srcdir)/src/os2/region.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/region.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_filehistory.o: $(srcdir)/src/gtk/filehistory.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/filehistory.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_renderer.o: $(srcdir)/src/gtk/renderer.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/renderer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_font.o: $(srcdir)/src/gtk/font.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/font.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_renderer.o: $(srcdir)/src/gtk1/renderer.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/renderer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_sockgtk.o: $(srcdir)/src/gtk/sockgtk.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/sockgtk.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_renderer.o: $(srcdir)/src/msw/renderer.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_minifram.o: $(srcdir)/src/gtk/minifram.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/minifram.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_renderer.o: $(srcdir)/src/msw/renderer.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_pen.o: $(srcdir)/src/gtk/pen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/pen.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_popupwin.o: $(srcdir)/src/gtk/popupwin.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/popupwin.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_private.o: $(srcdir)/src/gtk/private.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/private.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_settings.o: $(srcdir)/src/gtk/settings.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_region.o: $(srcdir)/src/gtk/region.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/region.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_settings.o: $(srcdir)/src/gtk1/settings.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_renderer.o: $(srcdir)/src/gtk/renderer.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/renderer.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_settings.o: $(srcdir)/src/msw/settings.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_settings.o: $(srcdir)/src/gtk/settings.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/settings.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_settings.o: $(srcdir)/src/msw/settings.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_timer.o: $(srcdir)/src/gtk/timer.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/timer.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_settings.o: $(srcdir)/src/x11/settings.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_tooltip.o: $(srcdir)/src/gtk/tooltip.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/tooltip.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_settings.o: $(srcdir)/src/mgl/settings.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_toplevel.o: $(srcdir)/src/gtk/toplevel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/toplevel.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_settings.o: $(srcdir)/src/dfb/settings.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_utilsgtk.o: $(srcdir)/src/gtk/utilsgtk.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/utilsgtk.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_settings.o: $(srcdir)/src/motif/settings.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_win_gtk.o: $(srcdir)/src/gtk/win_gtk.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/win_gtk.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_window.o: $(srcdir)/src/gtk/window.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/window.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_app.o: $(srcdir)/src/gtk1/app.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/app.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_settings.o: $(srcdir)/src/cocoa/settings.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/settings.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_bitmap.o: $(srcdir)/src/gtk1/bitmap.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/bitmap.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_settings.o: $(srcdir)/src/os2/settings.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/settings.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_brush.o: $(srcdir)/src/gtk1/brush.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/brush.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_timer.o: $(srcdir)/src/gtk/timer.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/timer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_clipbrd.o: $(srcdir)/src/gtk1/clipbrd.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/clipbrd.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_timer.o: $(srcdir)/src/gtk1/timer.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/timer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_colour.o: $(srcdir)/src/gtk1/colour.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/colour.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_timer.o: $(srcdir)/src/osx/core/timer.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_cursor.o: $(srcdir)/src/gtk1/cursor.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/cursor.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_timer.o: $(srcdir)/src/osx/core/timer.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_data.o: $(srcdir)/src/gtk1/data.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/data.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_timer.o: $(srcdir)/src/generic/timer.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_dataobj.o: $(srcdir)/src/gtk1/dataobj.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/dataobj.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_timer.o: $(srcdir)/src/generic/timer.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_dc.o: $(srcdir)/src/gtk1/dc.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/dc.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_timer.o: $(srcdir)/src/generic/timer.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_dcclient.o: $(srcdir)/src/gtk1/dcclient.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/dcclient.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_timer.o: $(srcdir)/src/motif/timer.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/timer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_dcmemory.o: $(srcdir)/src/gtk1/dcmemory.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/dcmemory.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_timer.o: $(srcdir)/src/cocoa/timer.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/timer.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_dcscreen.o: $(srcdir)/src/gtk1/dcscreen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/dcscreen.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_timer.o: $(srcdir)/src/os2/timer.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/timer.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_dnd.o: $(srcdir)/src/gtk1/dnd.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/dnd.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_tooltip.o: $(srcdir)/src/gtk/tooltip.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/tooltip.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_evtloop.o: $(srcdir)/src/gtk1/evtloop.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/evtloop.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_tooltip.o: $(srcdir)/src/gtk1/tooltip.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/tooltip.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_font.o: $(srcdir)/src/gtk1/font.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/font.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_sockgtk.o: $(srcdir)/src/gtk1/sockgtk.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/sockgtk.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_main.o: $(srcdir)/src/gtk1/main.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/main.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_tooltip.o: $(srcdir)/src/osx/carbon/tooltip.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tooltip.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_minifram.o: $(srcdir)/src/gtk1/minifram.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/minifram.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_tooltip.o: $(srcdir)/src/osx/carbon/tooltip.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tooltip.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_pen.o: $(srcdir)/src/gtk1/pen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/pen.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_tooltip.o: $(srcdir)/src/cocoa/tooltip.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/tooltip.mm
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_popupwin.o: $(srcdir)/src/gtk1/popupwin.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/popupwin.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_tooltip.o: $(srcdir)/src/os2/tooltip.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/tooltip.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_region.o: $(srcdir)/src/gtk1/region.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/region.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_toplevel.o: $(srcdir)/src/gtk/toplevel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/toplevel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_renderer.o: $(srcdir)/src/gtk1/renderer.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/renderer.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_toplevel.o: $(srcdir)/src/gtk1/toplevel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/toplevel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_settings.o: $(srcdir)/src/gtk1/settings.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/settings.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_timer.o: $(srcdir)/src/gtk1/timer.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/timer.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_tooltip.o: $(srcdir)/src/gtk1/tooltip.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/tooltip.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_toplevel.o: $(srcdir)/src/x11/toplevel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/toplevel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_toplevel.o: $(srcdir)/src/gtk1/toplevel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/toplevel.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_toplevel.o: $(srcdir)/src/mgl/toplevel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/toplevel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_utilsgtk.o: $(srcdir)/src/gtk1/utilsgtk.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/utilsgtk.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_toplevel.o: $(srcdir)/src/dfb/toplevel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/toplevel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_win_gtk.o: $(srcdir)/src/gtk1/win_gtk.c $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/gtk1/win_gtk.c
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_toplevel.o: $(srcdir)/src/motif/toplevel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/toplevel.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gtk1_window.o: $(srcdir)/src/gtk1/window.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/window.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_toplevel.o: $(srcdir)/src/cocoa/toplevel.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/toplevel.mm
+@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_toplevel.o: $(srcdir)/src/os2/toplevel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/toplevel.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_bitmap.o: $(srcdir)/src/x11/bitmap.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/bitmap.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_utilsgtk.o: $(srcdir)/src/gtk/utilsgtk.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/utilsgtk.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_x11_brush.o: $(srcdir)/src/x11/brush.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_utilsgtk.o: $(srcdir)/src/gtk1/utilsgtk.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/utilsgtk.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_brush.o: $(srcdir)/src/x11/brush.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/brush.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_win_gtk.o: $(srcdir)/src/gtk/win_gtk.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/win_gtk.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_x11_palette.o: $(srcdir)/src/x11/palette.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_win_gtk.o: $(srcdir)/src/gtk1/win_gtk.c $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/gtk1/win_gtk.c
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_palette.o: $(srcdir)/src/x11/palette.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_window.o: $(srcdir)/src/gtk/window.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/window.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_x11_pen.o: $(srcdir)/src/x11/pen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_window.o: $(srcdir)/src/gtk1/window.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/window.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_pen.o: $(srcdir)/src/x11/pen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/pen.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_window.o: $(srcdir)/src/msw/window.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/window.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_x11_region.o: $(srcdir)/src/x11/region.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/region.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_window.o: $(srcdir)/src/msw/window.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/window.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_region.o: $(srcdir)/src/x11/region.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/region.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_window.o: $(srcdir)/src/x11/window.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/window.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_window.o: $(srcdir)/src/mgl/window.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/window.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_window.o: $(srcdir)/src/dfb/window.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/window.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_window.o: $(srcdir)/src/motif/window.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/window.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_window.o: $(srcdir)/src/osx/carbon/window.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/window.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_app.o: $(srcdir)/src/msw/app.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/app.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_window.o: $(srcdir)/src/osx/cocoa/window.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/window.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_app.o: $(srcdir)/src/msw/app.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/app.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_window.o: $(srcdir)/src/cocoa/window.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/window.mm
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_window.o: $(srcdir)/src/os2/window.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/window.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_bitmap.o: $(srcdir)/src/msw/bitmap.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/bitmap.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_data.o: $(srcdir)/src/gtk1/data.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/data.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_brush.o: $(srcdir)/src/msw/brush.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_data.o: $(srcdir)/src/msw/data.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/data.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_brush.o: $(srcdir)/src/msw/brush.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/brush.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_data.o: $(srcdir)/src/msw/data.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/data.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_caret.o: $(srcdir)/src/msw/caret.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_data.o: $(srcdir)/src/x11/data.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/data.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_caret.o: $(srcdir)/src/msw/caret.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/caret.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_data.o: $(srcdir)/src/mgl/data.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/data.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_data.o: $(srcdir)/src/motif/data.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/data.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_clipbrd.o: $(srcdir)/src/msw/clipbrd.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/clipbrd.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_data.o: $(srcdir)/src/cocoa/data.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/data.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_colour.o: $(srcdir)/src/msw/colour.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_data.o: $(srcdir)/src/os2/data.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/data.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_colour.o: $(srcdir)/src/msw/colour.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/colour.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_palette.o: $(srcdir)/src/x11/palette.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_cursor.o: $(srcdir)/src/msw/cursor.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_palette.o: $(srcdir)/src/x11/palette.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/palette.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_cursor.o: $(srcdir)/src/msw/cursor.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/cursor.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_palette.o: $(srcdir)/src/msw/palette.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_data.o: $(srcdir)/src/msw/data.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/data.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_palette.o: $(srcdir)/src/msw/palette.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_data.o: $(srcdir)/src/msw/data.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/data.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_palette.o: $(srcdir)/src/osx/palette.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_dc.o: $(srcdir)/src/msw/dc.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_palette.o: $(srcdir)/src/osx/palette.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_dc.o: $(srcdir)/src/msw/dc.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dc.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_palette.o: $(srcdir)/src/mgl/palette.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/palette.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_palette.o: $(srcdir)/src/os2/palette.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/palette.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_dcclient.o: $(srcdir)/src/msw/dcclient.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcclient.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_utilsx.o: $(srcdir)/src/x11/utilsx.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/utilsx.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_dcmemory.o: $(srcdir)/src/msw/dcmemory.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcmemory.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_dcprint.o: $(srcdir)/src/msw/dcprint.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcprint.cpp
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_dcscreen.o: $(srcdir)/src/msw/dcscreen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dcscreen.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_dialup.o: $(srcdir)/src/msw/dialup.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dcprint.o: $(srcdir)/src/os2/dcprint.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dcprint.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_dialup.o: $(srcdir)/src/msw/dialup.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dialup.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@corelib_dib.o: $(srcdir)/src/msw/dib.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@corelib_dib.o: $(srcdir)/src/msw/dib.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
@@ -28902,65 +33149,83 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_dib.o: $(srcdir)/src/msw/dib.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_dib.o: $(srcdir)/src/msw/dib.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dib.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_display.o: $(srcdir)/src/msw/display.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_display.o: $(srcdir)/src/msw/display.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/display.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/display.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_display.o: $(srcdir)/src/msw/display.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_display.o: $(srcdir)/src/msw/display.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/display.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/display.cpp
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_display.o: $(srcdir)/src/osx/core/display.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_display.o: $(srcdir)/src/osx/core/display.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_display.o: $(srcdir)/src/cocoa/display.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/display.mm
-
  @COND_TOOLKIT_MSW_USE_GUI_1@corelib_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@corelib_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_enhmeta.o: $(srcdir)/src/msw/enhmeta.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/enhmeta.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_font.o: $(srcdir)/src/msw/font.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/font.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_font.o: $(srcdir)/src/msw/font.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/font.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_fontenum.o: $(srcdir)/src/msw/fontenum.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/fontenum.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_fontutil.o: $(srcdir)/src/msw/fontutil.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/fontutil.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/gdiimage.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
-
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
-
  @COND_TOOLKIT_MSW_USE_GUI_1@corelib_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@corelib_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_graphics.o: $(srcdir)/src/msw/graphics.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_graphics.o: $(srcdir)/src/msw/graphics.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_graphics.o: $(srcdir)/src/msw/graphics.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_graphics.o: $(srcdir)/src/msw/graphics.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_icon.o: $(srcdir)/src/msw/icon.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_icon.o: $(srcdir)/src/msw/icon.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/icon.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_imaglist.o: $(srcdir)/src/msw/imaglist.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/imaglist.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_minifram.o: $(srcdir)/src/msw/minifram.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_minifram.o: $(srcdir)/src/msw/minifram.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/minifram.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_ole_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_ole_dataobj.o: $(srcdir)/src/msw/ole/dataobj.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/dataobj.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@corelib_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/dropsrc.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@corelib_dropsrc.o: $(srcdir)/src/msw/ole/dropsrc.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/dropsrc.cpp
@@ -28980,17 +33245,29 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_oleutils.o: $(srcdir)/src/msw/ole/oleutils.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/oleutils.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_palette.o: $(srcdir)/src/msw/palette.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_palette.o: $(srcdir)/src/msw/palette.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/palette.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_pen.o: $(srcdir)/src/msw/pen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_pen.o: $(srcdir)/src/msw/pen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/pen.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_printdlg.o: $(srcdir)/src/osx/carbon/printdlg.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/printdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_popupwin.o: $(srcdir)/src/msw/popupwin.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/popupwin.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_printdlg.o: $(srcdir)/src/osx/carbon/printdlg.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/printdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_printdlg.o: $(srcdir)/src/msw/printdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/printdlg.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@corelib_printwin.o: $(srcdir)/src/msw/printwin.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/printwin.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@corelib_printwin.o: $(srcdir)/src/msw/printwin.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/printwin.cpp
@@ -28998,314 +33275,488 @@ 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) $(srcdir)/src/msw/printwin.cpp
  
  @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) $(srcdir)/src/msw/printwin.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_region.o: $(srcdir)/src/msw/region.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/region.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_region.o: $(srcdir)/src/msw/region.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/region.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_renderer.o: $(srcdir)/src/msw/renderer.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_renderer.o: $(srcdir)/src/msw/renderer.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/renderer.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_settings.o: $(srcdir)/src/msw/settings.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_settings.o: $(srcdir)/src/msw/settings.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/settings.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_tooltip.o: $(srcdir)/src/msw/tooltip.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/tooltip.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_toplevel.o: $(srcdir)/src/msw/toplevel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/toplevel.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_uiaction.o: $(srcdir)/src/msw/uiaction.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/uiaction.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_uiaction.o: $(srcdir)/src/msw/uiaction.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/uiaction.cpp
+
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_utilsgui.o: $(srcdir)/src/msw/utilsgui.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/utilsgui.cpp
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_utilsgui.o: $(srcdir)/src/os2/utilsgui.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/utilsgui.cpp
-
  @COND_TOOLKIT_MSW_USE_GUI_1@corelib_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@corelib_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@corelib_uxtheme.o: $(srcdir)/src/msw/uxtheme.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/uxtheme.cpp
  
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_window.o: $(srcdir)/src/msw/window.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/window.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_msw_window.o: $(srcdir)/src/msw/window.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/window.cpp
+
  @COND_TOOLKIT_MSW_USE_GUI_1@corelib_helpchm.o: $(srcdir)/src/msw/helpchm.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/helpchm.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@corelib_helpchm.o: $(srcdir)/src/msw/helpchm.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/helpchm.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1@corelib_helpwin.o: $(srcdir)/src/msw/helpwin.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_helpwin.o: $(srcdir)/src/msw/helpwin.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/helpwin.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/helpwin.cpp
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/helpwin.cpp
-
  @COND_TOOLKIT_MSW_USE_GUI_1@corelib_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/automtn.cpp
  
  @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) $(srcdir)/src/msw/ole/uuid.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@corelib_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/automtn.cpp
  
  @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) $(srcdir)/src/msw/ole/uuid.cpp
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_accel.o: $(srcdir)/src/osx/accel.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_accel.o: $(srcdir)/src/osx/accel.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@corelib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_osx_brush.o: $(srcdir)/src/osx/brush.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_osx_brush.o: $(srcdir)/src/osx/brush.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@corelib_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@corelib_osx_brush.o: $(srcdir)/src/osx/brush.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/brush.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/motif/accel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/msw/accel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/msw/accel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@corelib_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_accel.o: $(srcdir)/src/os2/accel.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/accel.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_osx_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_osx_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_artmac.o: $(srcdir)/src/osx/artmac.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/artmac.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@corelib_osx_fontutil.o: $(srcdir)/src/osx/fontutil.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/fontutil.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_osx_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_osx_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@corelib_osx_imaglist.o: $(srcdir)/src/osx/imaglist.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/imaglist.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_osx_minifram.o: $(srcdir)/src/osx/minifram.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_osx_minifram.o: $(srcdir)/src/osx/minifram.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@corelib_osx_minifram.o: $(srcdir)/src/osx/minifram.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/minifram.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@corelib_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_osx_palette.o: $(srcdir)/src/osx/palette.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_osx_palette.o: $(srcdir)/src/osx/palette.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@corelib_osx_palette.o: $(srcdir)/src/osx/palette.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/palette.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_osx_pen.o: $(srcdir)/src/osx/pen.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_dialog_osx.o: $(srcdir)/src/osx/dialog_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/dialog_osx.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_osx_pen.o: $(srcdir)/src/osx/pen.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@corelib_osx_pen.o: $(srcdir)/src/osx/pen.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/pen.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@corelib_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_uiaction_osx.o: $(srcdir)/src/osx/uiaction_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/uiaction_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_uiaction_osx.o: $(srcdir)/src/osx/uiaction_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/uiaction_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@corelib_uiaction_osx.o: $(srcdir)/src/osx/uiaction_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/uiaction_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@corelib_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@corelib_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_core_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_core_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@corelib_core_bitmap.o: $(srcdir)/src/osx/core/bitmap.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/bitmap.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_core_colour.o: $(srcdir)/src/osx/core/colour.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_core_colour.o: $(srcdir)/src/osx/core/colour.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@corelib_core_colour.o: $(srcdir)/src/osx/core/colour.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/colour.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_core_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_core_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@corelib_core_dcmemory.o: $(srcdir)/src/osx/core/dcmemory.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/dcmemory.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_core_display.o: $(srcdir)/src/osx/core/display.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_core_display.o: $(srcdir)/src/osx/core/display.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@corelib_core_display.o: $(srcdir)/src/osx/core/display.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/display.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_core_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_core_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@corelib_core_fontenum.o: $(srcdir)/src/osx/core/fontenum.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/fontenum.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@corelib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1@corelib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@corelib_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_core_timer.o: $(srcdir)/src/osx/core/timer.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_core_timer.o: $(srcdir)/src/osx/core/timer.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@corelib_core_timer.o: $(srcdir)/src/osx/core/timer.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/timer.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@corelib_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1@corelib_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_generic_timer.o: $(srcdir)/src/generic/timer.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_generic_timer.o: $(srcdir)/src/generic/timer.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/timer.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_app.o: $(srcdir)/src/x11/app.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/app.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_clipbrd.o: $(srcdir)/src/x11/clipbrd.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/clipbrd.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_colour.o: $(srcdir)/src/x11/colour.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/colour.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_cursor.o: $(srcdir)/src/x11/cursor.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/cursor.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_data.o: $(srcdir)/src/x11/data.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/data.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_dataobj.o: $(srcdir)/src/x11/dataobj.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/dataobj.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_dc.o: $(srcdir)/src/x11/dc.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/dc.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_nonownedwnd_osx.o: $(srcdir)/src/osx/nonownedwnd_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/nonownedwnd_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_dcclient.o: $(srcdir)/src/x11/dcclient.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/dcclient.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_dcmemory.o: $(srcdir)/src/x11/dcmemory.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/dcmemory.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_dcscreen.o: $(srcdir)/src/x11/dcscreen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/dcscreen.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_evtloop.o: $(srcdir)/src/x11/evtloop.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/evtloop.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_font.o: $(srcdir)/src/x11/font.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/font.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_minifram.o: $(srcdir)/src/x11/minifram.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/minifram.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_nanox.o: $(srcdir)/src/x11/nanox.c $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/x11/nanox.c
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_popupwin.o: $(srcdir)/src/x11/popupwin.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/popupwin.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_reparent.o: $(srcdir)/src/x11/reparent.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/reparent.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_settings.o: $(srcdir)/src/x11/settings.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/settings.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_toplevel.o: $(srcdir)/src/x11/toplevel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/toplevel.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_utils.o: $(srcdir)/src/x11/utils.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/utils.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_x11_window.o: $(srcdir)/src/x11/window.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/window.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_generic_colour.o: $(srcdir)/src/generic/colour.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_generic_colour.o: $(srcdir)/src/generic/colour.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colour.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mask.o: $(srcdir)/src/generic/mask.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_mask.o: $(srcdir)/src/generic/mask.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_app.o: $(srcdir)/src/mgl/app.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/app.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_bitmap.o: $(srcdir)/src/mgl/bitmap.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/bitmap.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_brush.o: $(srcdir)/src/mgl/brush.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/brush.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_clipbrd.o: $(srcdir)/src/mgl/clipbrd.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/clipbrd.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_tabctrl_osx.o: $(srcdir)/src/osx/tabctrl_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/tabctrl_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_cursor.o: $(srcdir)/src/mgl/cursor.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/cursor.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_tabctrl_osx.o: $(srcdir)/src/osx/tabctrl_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/tabctrl_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_data.o: $(srcdir)/src/mgl/data.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/data.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_dc.o: $(srcdir)/src/mgl/dc.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/dc.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_dcclient.o: $(srcdir)/src/mgl/dcclient.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/dcclient.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_dcmemory.o: $(srcdir)/src/mgl/dcmemory.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/dcmemory.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_dcscreen.o: $(srcdir)/src/mgl/dcscreen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/dcscreen.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/dirmgl.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/evtloop.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_font.o: $(srcdir)/src/mgl/font.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/font.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_toplevel_osx.o: $(srcdir)/src/osx/toplevel_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/toplevel_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_fontenum.o: $(srcdir)/src/mgl/fontenum.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/fontenum.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_fontmgr.o: $(srcdir)/src/mgl/fontmgr.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/fontmgr.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_utils_osx.o: $(srcdir)/src/osx/utils_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/utils_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_fontutil.o: $(srcdir)/src/mgl/fontutil.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/fontutil.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_palette.o: $(srcdir)/src/mgl/palette.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/palette.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_window_osx.o: $(srcdir)/src/osx/window_osx.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/window_osx.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_pen.o: $(srcdir)/src/mgl/pen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/pen.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_region.o: $(srcdir)/src/mgl/region.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/region.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_settings.o: $(srcdir)/src/mgl/settings.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/settings.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1@corelib_hid.o: $(srcdir)/src/osx/core/hid.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/hid.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_toplevel.o: $(srcdir)/src/mgl/toplevel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/toplevel.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_utils.o: $(srcdir)/src/mgl/utils.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/utils.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_printmac.o: $(srcdir)/src/osx/core/printmac.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/printmac.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mgl_window.o: $(srcdir)/src/mgl/window.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/window.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@corelib_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_app.o: $(srcdir)/src/dfb/app.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/app.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@corelib_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_bitmap.o: $(srcdir)/src/dfb/bitmap.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/bitmap.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1@corelib_utilsexc_cf.o: $(srcdir)/src/osx/core/utilsexc_cf.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/utilsexc_cf.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_brush.o: $(srcdir)/src/dfb/brush.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/brush.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_nanox.o: $(srcdir)/src/x11/nanox.c $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/x11/nanox.c
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_cursor.o: $(srcdir)/src/dfb/cursor.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/cursor.cpp
  
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_reparent.o: $(srcdir)/src/x11/reparent.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/reparent.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_dc.o: $(srcdir)/src/dfb/dc.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/dc.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_dcclient.o: $(srcdir)/src/dfb/dcclient.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/dcclient.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_fontmgrcmn.o: $(srcdir)/src/common/fontmgrcmn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontmgrcmn.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_dcmemory.o: $(srcdir)/src/dfb/dcmemory.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/dcmemory.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_mask.o: $(srcdir)/src/generic/mask.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_dcscreen.o: $(srcdir)/src/dfb/dcscreen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/dcscreen.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_mask.o: $(srcdir)/src/generic/mask.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/mask.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_evtloop.o: $(srcdir)/src/dfb/evtloop.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/evtloop.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_dirmgl.o: $(srcdir)/src/mgl/dirmgl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/dirmgl.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_font.o: $(srcdir)/src/dfb/font.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/font.cpp
  
  
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_fontmgr.o: $(srcdir)/src/mgl/fontmgr.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/fontmgr.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_fontenum.o: $(srcdir)/src/dfb/fontenum.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/fontenum.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_fontmgr.o: $(srcdir)/src/dfb/fontmgr.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_fontmgr.o: $(srcdir)/src/dfb/fontmgr.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/fontmgr.cpp
  
  @COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/fontmgr.cpp
  
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_nonownedwnd.o: $(srcdir)/src/dfb/nonownedwnd.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_nonownedwnd.o: $(srcdir)/src/dfb/nonownedwnd.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/nonownedwnd.cpp
  
  @COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/nonownedwnd.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_nonownedwnd.o: $(srcdir)/src/osx/carbon/nonownedwnd.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/nonownedwnd.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_overlay.o: $(srcdir)/src/dfb/overlay.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/overlay.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_pen.o: $(srcdir)/src/dfb/pen.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/pen.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_nonownedwnd.o: $(srcdir)/src/osx/cocoa/nonownedwnd.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/nonownedwnd.mm
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_region.o: $(srcdir)/src/dfb/region.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/region.cpp
  
  
-@COND_TOOLKIT_DFB_USE_GUI_1@corelib_overlay.o: $(srcdir)/src/dfb/overlay.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/overlay.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_settings.o: $(srcdir)/src/dfb/settings.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/settings.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_toplevel.o: $(srcdir)/src/dfb/toplevel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/toplevel.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_utils.o: $(srcdir)/src/dfb/utils.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/utils.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_dfb_window.o: $(srcdir)/src/dfb/window.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/window.cpp
  
  @COND_TOOLKIT_DFB_USE_GUI_1@corelib_wrapdfb.o: $(srcdir)/src/dfb/wrapdfb.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/wrapdfb.cpp
  
  @COND_TOOLKIT_DFB_USE_GUI_1@corelib_wrapdfb.o: $(srcdir)/src/dfb/wrapdfb.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/dfb/wrapdfb.cpp
@@ -29316,36 +33767,48 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_PLATFORM_MACOSX_1_USE_GUI_1@corelib_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(CORELIB_ODEP)
  @COND_PLATFORM_MACOSX_1_USE_GUI_1@     $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
  
  @COND_PLATFORM_MACOSX_1_USE_GUI_1@corelib_apptraits.o: $(srcdir)/src/unix/apptraits.cpp $(CORELIB_ODEP)
  @COND_PLATFORM_MACOSX_1_USE_GUI_1@     $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/apptraits.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_USE_GUI_1_WXUNIV_1@corelib_generic_accel.o: $(srcdir)/src/generic/accel.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/accel.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
+
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
-@COND_USE_GUI_1_WXUNIV_1@corelib_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@corelib_generic_fdrepdlg.o: $(srcdir)/src/generic/fdrepdlg.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fdrepdlg.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_fdrepdlg.o: $(srcdir)/src/msw/fdrepdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/fdrepdlg.cpp
-
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
@@ -29361,11 +33824,14 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
@@ -29376,36 +33842,33 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
  @COND_USE_GUI_1_WXUNIV_1@corelib_filepickerg.o: $(srcdir)/src/generic/filepickerg.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filepickerg.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
-@COND_USE_GUI_1_WXUNIV_1@corelib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@corelib_generic_listctrl.o: $(srcdir)/src/generic/listctrl.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listctrl.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
-
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
@@ -29421,11 +33884,14 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
@@ -29433,57 +33899,36 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
  @COND_USE_GUI_1_WXUNIV_1@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/prntdlgg.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_generic_statusbr.o: $(srcdir)/src/generic/statusbr.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
  @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statusbr.cpp
  
-@COND_USE_GUI_1_WXUNIV_1@corelib_statusbr.o: $(srcdir)/src/univ/statusbr.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/statusbr.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@corelib_tabg.o: $(srcdir)/src/generic/tabg.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/tabg.cpp
-
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
@@ -29496,11 +33941,14 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
@@ -29508,1151 +33956,956 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
  @COND_USE_GUI_1_WXUNIV_1@corelib_fontdlgg.o: $(srcdir)/src/generic/fontdlgg.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontdlgg.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@corelib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/gtk/bmpbuttn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/bmpbuttn.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/gtk1/bmpbuttn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/bmpbuttn.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/motif/bmpbuttn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/bmpbuttn.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/osx/carbon/bmpbuttn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/bmpbuttn.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/osx/cocoa/bmpbuttn.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/bmpbuttn.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/cocoa/bmpbuttn.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/bmpbuttn.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn.o: $(srcdir)/src/os2/bmpbuttn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/bmpbuttn.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@corelib_bmpbuttn.o: $(srcdir)/src/univ/bmpbuttn.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/bmpbuttn.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_button.o: $(srcdir)/src/gtk/button.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/button.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_button.o: $(srcdir)/src/gtk1/button.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/button.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_button.o: $(srcdir)/src/motif/button.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/button.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_button.o: $(srcdir)/src/msw/button.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/button.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_button.o: $(srcdir)/src/msw/button.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/button.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_button.o: $(srcdir)/src/osx/carbon/button.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/button.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_button.o: $(srcdir)/src/osx/cocoa/button.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/button.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_button.o: $(srcdir)/src/cocoa/button.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/button.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_button.o: $(srcdir)/src/os2/button.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/button.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@corelib_button.o: $(srcdir)/src/univ/button.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/button.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_checkbox.o: $(srcdir)/src/gtk/checkbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/checkbox.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_checkbox.o: $(srcdir)/src/gtk1/checkbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/checkbox.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_checkbox.o: $(srcdir)/src/motif/checkbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/checkbox.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_checkbox.o: $(srcdir)/src/osx/carbon/checkbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/checkbox.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_checkbox.o: $(srcdir)/src/osx/cocoa/checkbox.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/checkbox.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_checkbox.o: $(srcdir)/src/cocoa/checkbox.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/checkbox.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_checkbox.o: $(srcdir)/src/os2/checkbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/checkbox.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@corelib_checkbox.o: $(srcdir)/src/univ/checkbox.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/checkbox.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_checklst.o: $(srcdir)/src/gtk/checklst.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/checklst.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_checklst.o: $(srcdir)/src/gtk1/checklst.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/checklst.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_checklst.o: $(srcdir)/src/motif/checklst.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/checklst.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_checklst.o: $(srcdir)/src/msw/checklst.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/checklst.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_checklst.o: $(srcdir)/src/msw/wince/checklst.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/wince/checklst.cpp
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_checklst.o: $(srcdir)/src/cocoa/checklst.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/checklst.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_checklst.o: $(srcdir)/src/os2/checklst.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/checklst.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@corelib_checklst.o: $(srcdir)/src/univ/checklst.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/checklst.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/gtk/choice.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/choice.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/gtk1/choice.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/choice.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/motif/choice.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/choice.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/msw/choice.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/msw/choice.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
-
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/osx/carbon/choice.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/choice.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/osx/cocoa/choice.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/choice.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/cocoa/choice.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/choice.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_choice.o: $(srcdir)/src/os2/choice.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/choice.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@corelib_choice.o: $(srcdir)/src/univ/choice.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/choice.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_colordlg.o: $(srcdir)/src/gtk/colordlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/colordlg.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_colordlg.o: $(srcdir)/src/osx/carbon/colordlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_colordlg.o: $(srcdir)/src/cocoa/colordlg.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/colordlg.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_combobox.o: $(srcdir)/src/gtk/combobox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_combobox.o: $(srcdir)/src/gtk1/combobox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/combobox.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_combobox.o: $(srcdir)/src/motif/combobox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/combobox.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_combobox.o: $(srcdir)/src/msw/combobox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
+@COND_USE_GUI_1_WXUNIV_1@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_combobox.o: $(srcdir)/src/msw/combobox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_combobox.o: $(srcdir)/src/cocoa/combobox.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/combobox.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_combobox.o: $(srcdir)/src/os2/combobox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@corelib_combobox.o: $(srcdir)/src/univ/combobox.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/combobox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_control.o: $(srcdir)/src/gtk/control.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_control.o: $(srcdir)/src/gtk1/control.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/control.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_control.o: $(srcdir)/src/motif/control.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/control.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_control.o: $(srcdir)/src/msw/control.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/control.cpp
+@COND_USE_GUI_1_WXUNIV_1@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_control.o: $(srcdir)/src/msw/control.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/control.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_control.o: $(srcdir)/src/osx/carbon/control.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_control.o: $(srcdir)/src/osx/carbon/control.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_control.o: $(srcdir)/src/cocoa/control.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/control.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_control.o: $(srcdir)/src/os2/control.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/control.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@corelib_control.o: $(srcdir)/src/univ/control.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/control.cpp
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/gtk/dialog.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dialog.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/gtk1/dialog.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/dialog.cpp
+@COND_USE_GUI_1_WXUNIV_1@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/motif/dialog.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/dialog.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/msw/dialog.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/msw/dialog.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/osx/carbon/dialog.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dialog.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/osx/cocoa/dialog.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/dialog.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/cocoa/dialog.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/dialog.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dialog.o: $(srcdir)/src/os2/dialog.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/dialog.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@corelib_dialog.o: $(srcdir)/src/univ/dialog.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/dialog.cpp
+@COND_USE_GUI_1_WXUNIV_1@corelib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_dirdlg.o: $(srcdir)/src/gtk/dirdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/dirdlg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_dirdlg.o: $(srcdir)/src/osx/carbon/dirdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dirdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_dirdlg.o: $(srcdir)/src/osx/cocoa/dirdlg.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/dirdlg.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_dirdlg.o: $(srcdir)/src/cocoa/dirdlg.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/dirdlg.mm
+@COND_USE_GUI_1_WXUNIV_1@corelib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/gtk/filedlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/filedlg.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/gtk1/filedlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/filedlg.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/motif/filedlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/filedlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/osx/carbon/filedlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/filedlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/osx/cocoa/filedlg.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/filedlg.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/cocoa/filedlg.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/filedlg.mm
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_filedlg.o: $(srcdir)/src/os2/filedlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/filedlg.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_fontdlg.o: $(srcdir)/src/gtk/fontdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/fontdlg.cpp
+@COND_USE_GUI_1_WXUNIV_1@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_fontdlg.o: $(srcdir)/src/gtk1/fontdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/fontdlg.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_fontdlg.o: $(srcdir)/src/msw/fontdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/fontdlg.cpp
+@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) $(srcdir)/src/generic/mdig.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
+@COND_USE_GUI_1_WXUNIV_1@corelib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontdlg.o: $(srcdir)/src/cocoa/fontdlg.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/fontdlg.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_accel.o: $(srcdir)/src/msw/accel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/accel.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_fontdlg.o: $(srcdir)/src/os2/fontdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/fontdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_anybutton.o: $(srcdir)/src/msw/anybutton.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/anybutton.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_frame.o: $(srcdir)/src/gtk/frame.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/frame.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_anybutton.o: $(srcdir)/src/msw/anybutton.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/anybutton.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_frame.o: $(srcdir)/src/gtk1/frame.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/frame.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_artmsw.o: $(srcdir)/src/msw/artmsw.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/artmsw.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_frame.o: $(srcdir)/src/motif/frame.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/frame.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_artmsw.o: $(srcdir)/src/msw/artmsw.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/artmsw.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_frame.o: $(srcdir)/src/msw/frame.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_frame.o: $(srcdir)/src/msw/frame.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_bmpbuttn.o: $(srcdir)/src/msw/bmpbuttn.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/bmpbuttn.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_button.o: $(srcdir)/src/msw/button.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/button.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_button.o: $(srcdir)/src/msw/button.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/button.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_frame.o: $(srcdir)/src/cocoa/frame.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/frame.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_frame.o: $(srcdir)/src/os2/frame.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/frame.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_checkbox.o: $(srcdir)/src/msw/checkbox.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/checkbox.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/gtk/gauge.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/gauge.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_choice.o: $(srcdir)/src/msw/choice.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/gtk1/gauge.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/gauge.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_choice.o: $(srcdir)/src/msw/choice.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/choice.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/motif/gauge.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/gauge.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/msw/gauge.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_colordlg.o: $(srcdir)/src/msw/colordlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/colordlg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/msw/gauge.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_combo.o: $(srcdir)/src/msw/combo.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/osx/carbon/gauge.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gauge.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_combo.o: $(srcdir)/src/msw/combo.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/osx/cocoa/gauge.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/gauge.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_combobox.o: $(srcdir)/src/msw/combobox.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/cocoa/gauge.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/gauge.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_combobox.o: $(srcdir)/src/msw/combobox.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/combobox.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_gauge.o: $(srcdir)/src/os2/gauge.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/gauge.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_control.o: $(srcdir)/src/msw/control.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/control.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@corelib_gauge.o: $(srcdir)/src/univ/gauge.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/gauge.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_control.o: $(srcdir)/src/msw/control.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/control.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_print.o: $(srcdir)/src/gtk/print.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/print.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_dialog.o: $(srcdir)/src/msw/dialog.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_print.o: $(srcdir)/src/os2/print.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/print.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_dialog.o: $(srcdir)/src/msw/dialog.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dialog.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/gtk/listbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/listbox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/gtk1/listbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/listbox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_dirdlg.o: $(srcdir)/src/msw/dirdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dirdlg.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/motif/listbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/listbox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/msw/listbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/msw/listbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/osx/carbon/listbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/listbox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_filedlg.o: $(srcdir)/src/msw/filedlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/filedlg.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/osx/cocoa/listbox.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/listbox.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_frame.o: $(srcdir)/src/msw/frame.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/cocoa/listbox.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/listbox.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_frame.o: $(srcdir)/src/msw/frame.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/frame.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/os2/listbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/listbox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_gauge.o: $(srcdir)/src/msw/gauge.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@corelib_listbox.o: $(srcdir)/src/univ/listbox.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/listbox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_gauge.o: $(srcdir)/src/msw/gauge.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gauge.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_mdi.o: $(srcdir)/src/gtk/mdi.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/mdi.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_headerctrl.o: $(srcdir)/src/msw/headerctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/headerctrl.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_mdi.o: $(srcdir)/src/gtk1/mdi.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/mdi.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_headerctrl.o: $(srcdir)/src/msw/headerctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/headerctrl.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_mdi.o: $(srcdir)/src/motif/mdi.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/mdi.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_mdi.o: $(srcdir)/src/msw/mdi.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_mdi.o: $(srcdir)/src/msw/mdi.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_listbox.o: $(srcdir)/src/msw/listbox.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_listbox.o: $(srcdir)/src/msw/listbox.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/listbox.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_mdi.o: $(srcdir)/src/cocoa/mdi.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/mdi.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_menu.o: $(srcdir)/src/gtk/menu.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/menu.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_listctrl.o: $(srcdir)/src/msw/listctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/listctrl.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_menu.o: $(srcdir)/src/gtk1/menu.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/menu.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_mdi.o: $(srcdir)/src/msw/mdi.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_menu.o: $(srcdir)/src/motif/menu.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/menu.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_mdi.o: $(srcdir)/src/msw/mdi.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/mdi.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_menu.o: $(srcdir)/src/msw/menu.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_menu.o: $(srcdir)/src/msw/menu.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_menu.o: $(srcdir)/src/msw/menu.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_menu.o: $(srcdir)/src/msw/menu.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/menu.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_menu.o: $(srcdir)/src/osx/carbon/menu.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/menu.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_menu.o: $(srcdir)/src/osx/cocoa/menu.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/menu.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_menu.o: $(srcdir)/src/cocoa/menu.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/menu.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_menu.o: $(srcdir)/src/os2/menu.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/menu.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@corelib_menu.o: $(srcdir)/src/univ/menu.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/menu.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_msgdlg.o: $(srcdir)/src/gtk/msgdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/msgdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_metafile.o: $(srcdir)/src/msw/metafile.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_msgdlg.o: $(srcdir)/src/motif/msgdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/msgdlg.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_metafile.o: $(srcdir)/src/msw/metafile.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_msgdlg.o: $(srcdir)/src/msw/msgdlg.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/msgdlg.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_msgdlg.o: $(srcdir)/src/osx/carbon/msgdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/msgdlg.cpp
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_msgdlg.o: $(srcdir)/src/osx/cocoa/msgdlg.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/msgdlg.mm
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_msgdlg.o: $(srcdir)/src/cocoa/msgdlg.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/msgdlg.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_msgdlg.o: $(srcdir)/src/os2/msgdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/msgdlg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_nativewin.o: $(srcdir)/src/gtk/nativewin.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/nativewin.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_nativewin.o: $(srcdir)/src/msw/nativewin.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/nativewin.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_notebook.o: $(srcdir)/src/gtk/notebook.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/notebook.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_notebook.o: $(srcdir)/src/gtk1/notebook.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/notebook.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_notebook.o: $(srcdir)/src/generic/notebook.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/notebook.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_notebook.o: $(srcdir)/src/msw/notebook.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_notebook.o: $(srcdir)/src/msw/notebook.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_notebook.o: $(srcdir)/src/msw/notebook.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_notebook.o: $(srcdir)/src/msw/notebook.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/notebook.cpp
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_notebook.o: $(srcdir)/src/osx/cocoa/notebook.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/notebook.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_access.o: $(srcdir)/src/msw/ole/access.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_access.o: $(srcdir)/src/msw/ole/access.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_notebook.o: $(srcdir)/src/cocoa/notebook.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/notebook.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_notebook.o: $(srcdir)/src/os2/notebook.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/notebook.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@corelib_notebook.o: $(srcdir)/src/univ/notebook.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/notebook.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_panel.o: $(srcdir)/src/msw/panel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/panel.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_radiobox.o: $(srcdir)/src/gtk/radiobox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/radiobox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_panel.o: $(srcdir)/src/msw/panel.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/panel.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_radiobox.o: $(srcdir)/src/gtk1/radiobox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/radiobox.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_progdlg.o: $(srcdir)/src/msw/progdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/progdlg.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_radiobox.o: $(srcdir)/src/motif/radiobox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/radiobox.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_progdlg.o: $(srcdir)/src/msw/progdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/progdlg.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_radiobox.o: $(srcdir)/src/msw/radiobox.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/radiobox.cpp
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_radiobox.o: $(srcdir)/src/cocoa/radiobox.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/radiobox.mm
-
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_radiobox.o: $(srcdir)/src/os2/radiobox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/radiobox.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@corelib_radiobox.o: $(srcdir)/src/univ/radiobox.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/radiobox.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_radiobut.o: $(srcdir)/src/gtk/radiobut.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/radiobut.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_radiobut.o: $(srcdir)/src/gtk1/radiobut.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/radiobut.cpp
-
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_radiobut.o: $(srcdir)/src/motif/radiobut.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/radiobut.cpp
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_radiobut.o: $(srcdir)/src/msw/radiobut.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/radiobut.cpp
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_radiobut.o: $(srcdir)/src/osx/carbon/radiobut.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/radiobut.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_richmsgdlg.o: $(srcdir)/src/msw/richmsgdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/richmsgdlg.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_radiobut.o: $(srcdir)/src/osx/cocoa/radiobut.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/radiobut.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_richmsgdlg.o: $(srcdir)/src/msw/richmsgdlg.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/richmsgdlg.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_radiobut.o: $(srcdir)/src/cocoa/radiobut.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/radiobut.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_radiobut.o: $(srcdir)/src/os2/radiobut.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/radiobut.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@corelib_radiobut.o: $(srcdir)/src/univ/radiobut.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/radiobut.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_slider.o: $(srcdir)/src/msw/slider.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_scrolbar.o: $(srcdir)/src/gtk/scrolbar.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/scrolbar.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_slider.o: $(srcdir)/src/msw/slider.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_scrolbar.o: $(srcdir)/src/gtk1/scrolbar.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/scrolbar.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_scrolbar.o: $(srcdir)/src/motif/scrolbar.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/scrolbar.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_scrolbar.o: $(srcdir)/src/msw/scrolbar.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/scrolbar.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_scrolbar.o: $(srcdir)/src/osx/carbon/scrolbar.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/scrolbar.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_scrolbar.o: $(srcdir)/src/osx/cocoa/scrolbar.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/scrolbar.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_scrolbar.o: $(srcdir)/src/cocoa/scrolbar.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/scrolbar.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_statbox.o: $(srcdir)/src/msw/statbox.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_scrolbar.o: $(srcdir)/src/os2/scrolbar.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/scrolbar.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_statbox.o: $(srcdir)/src/msw/statbox.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@corelib_scrolbar.o: $(srcdir)/src/univ/scrolbar.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/scrolbar.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_scrolwin.o: $(srcdir)/src/gtk/scrolwin.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/scrolwin.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_scrolwin.o: $(srcdir)/src/gtk1/scrolwin.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/scrolwin.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_statline.o: $(srcdir)/src/msw/statline.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/gtk/slider.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/slider.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_statline.o: $(srcdir)/src/msw/statline.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/gtk1/slider.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/slider.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_stattext.o: $(srcdir)/src/msw/stattext.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/motif/slider.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/slider.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_stattext.o: $(srcdir)/src/msw/stattext.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/msw/slider.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/msw/slider.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/slider.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/osx/carbon/slider.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/slider.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/osx/cocoa/slider.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/slider.mm
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/cocoa/slider.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/slider.mm
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_textentry.o: $(srcdir)/src/msw/textentry.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_slider.o: $(srcdir)/src/os2/slider.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/slider.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_textentry.o: $(srcdir)/src/msw/textentry.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@corelib_slider.o: $(srcdir)/src/univ/slider.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/slider.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_msw_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_spinbutt.o: $(srcdir)/src/gtk/spinbutt.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/spinbutt.cpp
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_msw_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_spinbutt.o: $(srcdir)/src/gtk1/spinbutt.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/spinbutt.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_spinbutt.o: $(srcdir)/src/motif/spinbutt.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/spinbutt.cpp
+@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) $(srcdir)/src/msw/treectrl.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_anybutton_osx.o: $(srcdir)/src/osx/anybutton_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/anybutton_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_spinbutt.o: $(srcdir)/src/msw/spinbutt.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/spinbutt.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_anybutton_osx.o: $(srcdir)/src/osx/anybutton_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/anybutton_osx.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_spinbutt.o: $(srcdir)/src/osx/carbon/spinbutt.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/spinbutt.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_anybutton_osx.o: $(srcdir)/src/osx/anybutton_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/anybutton_osx.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_spinbutt.o: $(srcdir)/src/osx/cocoa/spinbutt.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/spinbutt.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_spinbutt.o: $(srcdir)/src/cocoa/spinbutt.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/spinbutt.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_spinbutt.o: $(srcdir)/src/os2/spinbutt.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/spinbutt.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_bmpbuttn_osx.o: $(srcdir)/src/osx/bmpbuttn_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/bmpbuttn_osx.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@corelib_spinbutt.o: $(srcdir)/src/univ/spinbutt.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/spinbutt.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_spinctrl.o: $(srcdir)/src/gtk/spinctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/spinctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_spinctrl.o: $(srcdir)/src/gtk1/spinctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/spinctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_button_osx.o: $(srcdir)/src/osx/button_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/button_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_spinctrl.o: $(srcdir)/src/msw/spinctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/spinctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_spinctrl.o: $(srcdir)/src/os2/spinctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/spinctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_checkbox_osx.o: $(srcdir)/src/osx/checkbox_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/checkbox_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_statbmp.o: $(srcdir)/src/gtk/statbmp.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_statbmp.o: $(srcdir)/src/gtk1/statbmp.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_statbmp.o: $(srcdir)/src/motif/statbmp.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_checklst_osx.o: $(srcdir)/src/osx/checklst_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/checklst_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_statbmp.o: $(srcdir)/src/msw/statbmp.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_statbmp.o: $(srcdir)/src/osx/carbon/statbmp.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_choice_osx.o: $(srcdir)/src/osx/choice_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/choice_osx.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_statbmp.o: $(srcdir)/src/cocoa/statbmp.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/statbmp.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_combobox_osx.o: $(srcdir)/src/osx/combobox_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/combobox_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_statbmp.o: $(srcdir)/src/os2/statbmp.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_combobox_osx.o: $(srcdir)/src/osx/combobox_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/combobox_osx.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@corelib_statbmp.o: $(srcdir)/src/univ/statbmp.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/statbmp.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_combobox_osx.o: $(srcdir)/src/osx/combobox_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/combobox_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_statbox.o: $(srcdir)/src/gtk/statbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_dnd_osx.o: $(srcdir)/src/osx/dnd_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/dnd_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_statbox.o: $(srcdir)/src/gtk1/statbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_dnd_osx.o: $(srcdir)/src/osx/dnd_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/dnd_osx.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_statbox.o: $(srcdir)/src/motif/statbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_dnd_osx.o: $(srcdir)/src/osx/dnd_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/dnd_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_statbox.o: $(srcdir)/src/msw/statbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_statbox.o: $(srcdir)/src/msw/statbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_statbox.o: $(srcdir)/src/osx/carbon/statbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_gauge_osx.o: $(srcdir)/src/osx/gauge_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/gauge_osx.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_statbox.o: $(srcdir)/src/osx/cocoa/statbox.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/statbox.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_statbox.o: $(srcdir)/src/cocoa/statbox.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/statbox.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_statbox.o: $(srcdir)/src/os2/statbox.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_listbox_osx.o: $(srcdir)/src/osx/listbox_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/listbox_osx.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@corelib_statbox.o: $(srcdir)/src/univ/statbox.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/statbox.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_statline.o: $(srcdir)/src/gtk/statline.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/statline.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_statline.o: $(srcdir)/src/gtk1/statline.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/statline.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_menu_osx.o: $(srcdir)/src/osx/menu_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/menu_osx.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_statline.o: $(srcdir)/src/generic/statline.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statline.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_statline.o: $(srcdir)/src/msw/statline.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_statline.o: $(srcdir)/src/msw/statline.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statline.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_menuitem_osx.o: $(srcdir)/src/osx/menuitem_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/menuitem_osx.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_statline.o: $(srcdir)/src/osx/cocoa/statline.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/statline.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_statline.o: $(srcdir)/src/os2/statline.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/statline.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@corelib_statline.o: $(srcdir)/src/univ/statline.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/statline.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_notebook_osx.o: $(srcdir)/src/osx/notebook_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/notebook_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/gtk/stattext.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_printdlg_osx.o: $(srcdir)/src/osx/printdlg_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/printdlg_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_printdlg_osx.o: $(srcdir)/src/osx/printdlg_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/printdlg_osx.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/motif/stattext.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_printdlg_osx.o: $(srcdir)/src/osx/printdlg_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/printdlg_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/msw/stattext.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/msw/stattext.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/osx/carbon/stattext.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_radiobox_osx.o: $(srcdir)/src/osx/radiobox_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/radiobox_osx.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/osx/cocoa/stattext.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/stattext.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/cocoa/stattext.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/stattext.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_stattext.o: $(srcdir)/src/os2/stattext.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_radiobut_osx.o: $(srcdir)/src/osx/radiobut_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/radiobut_osx.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@corelib_stattext.o: $(srcdir)/src/univ/stattext.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/stattext.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/tbargtk.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_tbargtk.o: $(srcdir)/src/gtk1/tbargtk.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/tbargtk.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_scrolbar_osx.o: $(srcdir)/src/osx/scrolbar_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/scrolbar_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/gtk/textctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/textctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/motif/textctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/textctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_slider_osx.o: $(srcdir)/src/osx/slider_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/slider_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/msw/textctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/textctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/osx/carbon/textctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/textctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_spinbutt_osx.o: $(srcdir)/src/osx/spinbutt_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/spinbutt_osx.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/osx/cocoa/textctrl.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/textctrl.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/cocoa/textctrl.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/textctrl.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_textctrl.o: $(srcdir)/src/os2/textctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/textctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_spinctrl_osx.o: $(srcdir)/src/osx/spinctrl_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/spinctrl_osx.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@corelib_textctrl.o: $(srcdir)/src/univ/textctrl.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/textctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_textentry.o: $(srcdir)/src/gtk/textentry.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/textentry.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_textentry.o: $(srcdir)/src/motif/textentry.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/textentry.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_srchctrl_osx.o: $(srcdir)/src/osx/srchctrl_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/srchctrl_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_textentry.o: $(srcdir)/src/msw/textentry.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_textentry.o: $(srcdir)/src/msw/textentry.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/textentry.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_textentry.o: $(srcdir)/src/os2/textentry.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/textentry.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_statbox_osx.o: $(srcdir)/src/osx/statbox_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/statbox_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@corelib_tglbtn.o: $(srcdir)/src/gtk/tglbtn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/tglbtn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_tglbtn.o: $(srcdir)/src/gtk1/tglbtn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/tglbtn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_statline_osx.o: $(srcdir)/src/osx/statline_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/statline_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_tglbtn.o: $(srcdir)/src/msw/tglbtn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/tglbtn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_tglbtn.o: $(srcdir)/src/osx/carbon/tglbtn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tglbtn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_tglbtn.o: $(srcdir)/src/osx/cocoa/tglbtn.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/tglbtn.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_stattext_osx.o: $(srcdir)/src/osx/stattext_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/stattext_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_tglbtn.o: $(srcdir)/src/os2/tglbtn.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/tglbtn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_textentry_osx.o: $(srcdir)/src/osx/textentry_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/textentry_osx.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@corelib_tglbtn.o: $(srcdir)/src/univ/tglbtn.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/tglbtn.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_textentry_osx.o: $(srcdir)/src/osx/textentry_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/textentry_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_textentry_osx.o: $(srcdir)/src/osx/textentry_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/textentry_osx.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_textctrl_osx.o: $(srcdir)/src/osx/textctrl_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/textctrl_osx.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_tglbtn_osx.o: $(srcdir)/src/osx/tglbtn_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/tglbtn_osx.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_toolbar_osx.o: $(srcdir)/src/osx/toolbar_osx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/toolbar_osx.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
  
  
-@COND_USE_GUI_1_WXUNIV_1@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_osx_accel.o: $(srcdir)/src/osx/accel.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_osx_accel.o: $(srcdir)/src/osx/accel.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_osx_accel.o: $(srcdir)/src/osx/accel.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/accel.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@corelib_colrdlgg.o: $(srcdir)/src/generic/colrdlgg.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/colrdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_clipbrd.o: $(srcdir)/src/osx/carbon/clipbrd.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/clipbrd.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@corelib_dirdlgg.o: $(srcdir)/src/generic/dirdlgg.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/dirdlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_cursor.o: $(srcdir)/src/osx/carbon/cursor.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/cursor.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@corelib_filedlgg.o: $(srcdir)/src/generic/filedlgg.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filedlgg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_icon.o: $(srcdir)/src/osx/carbon/icon.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/icon.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_app.o: $(srcdir)/src/osx/carbon/app.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_app.o: $(srcdir)/src/osx/carbon/app.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@corelib_fontpickerg.o: $(srcdir)/src/generic/fontpickerg.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/fontpickerg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_app.o: $(srcdir)/src/osx/carbon/app.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/app.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/menuitem.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_menuitem.o: $(srcdir)/src/msw/menuitem.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/menuitem.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_combobox.o: $(srcdir)/src/osx/carbon/combobox.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/combobox.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_menuitem.o: $(srcdir)/src/osx/carbon/menuitem.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/menuitem.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_control.o: $(srcdir)/src/osx/carbon/control.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_menuitem.o: $(srcdir)/src/osx/cocoa/menuitem.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/menuitem.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_control.o: $(srcdir)/src/osx/carbon/control.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_menuitem.o: $(srcdir)/src/cocoa/menuitem.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/menuitem.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_control.o: $(srcdir)/src/osx/carbon/control.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/control.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_menuitem.o: $(srcdir)/src/os2/menuitem.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/menuitem.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
  
  
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_toolbar.o: $(srcdir)/src/motif/toolbar.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/toolbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_dataobj.o: $(srcdir)/src/osx/carbon/dataobj.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dataobj.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_toolbar.o: $(srcdir)/src/msw/toolbar.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/toolbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_toolbar.o: $(srcdir)/src/osx/carbon/toolbar.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/toolbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_toolbar.o: $(srcdir)/src/osx/cocoa/toolbar.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/toolbar.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_dcclient.o: $(srcdir)/src/osx/carbon/dcclient.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcclient.cpp
  
  
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_toolbar.o: $(srcdir)/src/cocoa/toolbar.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/toolbar.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_toolbar.o: $(srcdir)/src/os2/toolbar.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/toolbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
  
  
-@COND_USE_GUI_1_WXUNIV_1@corelib_toolbar.o: $(srcdir)/src/univ/toolbar.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/toolbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_dcprint.o: $(srcdir)/src/osx/carbon/dcprint.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcprint.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_combo.o: $(srcdir)/src/msw/combo.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_combo.o: $(srcdir)/src/msw/combo.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/combo.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_dcscreen.o: $(srcdir)/src/osx/carbon/dcscreen.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dcscreen.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_dragimag.o: $(srcdir)/src/msw/dragimag.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/dragimag.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_glgrab.o: $(srcdir)/src/osx/core/glgrab.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/glgrab.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_glgrab.o: $(srcdir)/src/osx/core/glgrab.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/glgrab.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_iniconf.o: $(srcdir)/src/msw/iniconf.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/iniconf.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_glgrab.o: $(srcdir)/src/osx/core/glgrab.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/core/glgrab.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_iniconf.o: $(srcdir)/src/os2/iniconf.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/iniconf.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_metafile.o: $(srcdir)/src/msw/metafile.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_metafile.o: $(srcdir)/src/msw/metafile.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/metafile.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_graphics.o: $(srcdir)/src/osx/carbon/graphics.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/graphics.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_font.o: $(srcdir)/src/osx/carbon/font.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_font.o: $(srcdir)/src/osx/carbon/font.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_metafile.o: $(srcdir)/src/os2/metafile.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/metafile.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_font.o: $(srcdir)/src/osx/carbon/font.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/font.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_nativdlg.o: $(srcdir)/src/msw/nativdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/nativdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_nativdlg.o: $(srcdir)/src/os2/nativdlg.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/nativdlg.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_frame.o: $(srcdir)/src/osx/carbon/frame.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/frame.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_access.o: $(srcdir)/src/msw/ole/access.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_access.o: $(srcdir)/src/msw/ole/access.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ole/access.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_mdi.o: $(srcdir)/src/osx/carbon/mdi.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/mdi.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_ownerdrw.o: $(srcdir)/src/msw/ownerdrw.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/ownerdrw.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_ownerdrw.o: $(srcdir)/src/os2/ownerdrw.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/ownerdrw.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_metafile.o: $(srcdir)/src/osx/carbon/metafile.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/metafile.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_statusbar.o: $(srcdir)/src/msw/statusbar.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/statusbar.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
  
  
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_tabctrl.o: $(srcdir)/src/msw/tabctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/tabctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_tabctrl.o: $(srcdir)/src/osx/carbon/tabctrl.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tabctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_tabctrl.o: $(srcdir)/src/osx/carbon/tabctrl.cpp $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/tabctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
  
  
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_tabctrl.o: $(srcdir)/src/os2/tabctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/tabctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_popupwin.o: $(srcdir)/src/osx/carbon/popupwin.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/popupwin.cpp
  
  
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/treectrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
  
  
-@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) $(srcdir)/src/msw/treectrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_renderer.o: $(srcdir)/src/osx/carbon/renderer.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/renderer.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_colordlgosx.o: $(srcdir)/src/osx/carbon/colordlgosx.mm $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/colordlgosx.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
  
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_fontdlgosx.o: $(srcdir)/src/osx/carbon/fontdlgosx.mm $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlgosx.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_settings.o: $(srcdir)/src/osx/carbon/settings.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/settings.cpp
  
  @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(CORELIB_ODEP)
  @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
  
  @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(CORELIB_ODEP)
  @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
@@ -30660,30 +34913,33 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(CORELIB_ODEP)
  @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
  
  @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(CORELIB_ODEP)
  @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
  
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_statbrma.o: $(srcdir)/src/osx/carbon/statbrma.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/statbrma.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_region.o: $(srcdir)/src/osx/carbon/region.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/region.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_region.o: $(srcdir)/src/osx/carbon/region.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/region.cpp
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_region.o: $(srcdir)/src/osx/carbon/region.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/region.cpp
+
  @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(CORELIB_ODEP)
  @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
  
  @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(CORELIB_ODEP)
  
  @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(CORELIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
  
  
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_srchctrl.o: $(srcdir)/src/osx/carbon/srchctrl.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/srchctrl.cpp
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_utilscocoa.o: $(srcdir)/src/osx/carbon/utilscocoa.mm $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/carbon/utilscocoa.mm
  
  
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_srchctrl.o: $(srcdir)/src/osx/cocoa/srchctrl.mm $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/srchctrl.mm
-
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_regiong.o: $(srcdir)/src/generic/regiong.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@    $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
+@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_regiong.o: $(srcdir)/src/generic/regiong.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_regiong.o: $(srcdir)/src/generic/regiong.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
  
  
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_regiong.o: $(srcdir)/src/generic/regiong.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/regiong.cpp
  
-@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) $(srcdir)/src/generic/mdig.cpp
-
-@COND_USE_GUI_1_WXUNIV_1@corelib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/mdig.cpp
-
  @COND_USE_GUI_1@corelib_accelcmn.o: $(srcdir)/src/common/accelcmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/accelcmn.cpp
  
  @COND_USE_GUI_1@corelib_accelcmn.o: $(srcdir)/src/common/accelcmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/accelcmn.cpp
  
@@ -30693,6 +34949,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@corelib_anidecod.o: $(srcdir)/src/common/anidecod.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/anidecod.cpp
  
  @COND_USE_GUI_1@corelib_anidecod.o: $(srcdir)/src/common/anidecod.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/anidecod.cpp
  
+@COND_USE_GUI_1@corelib_affinematrix2d.o: $(srcdir)/src/common/affinematrix2d.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/affinematrix2d.cpp
+
  @COND_USE_GUI_1@corelib_appcmn.o: $(srcdir)/src/common/appcmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/appcmn.cpp
  
  @COND_USE_GUI_1@corelib_appcmn.o: $(srcdir)/src/common/appcmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/appcmn.cpp
  
@@ -30702,9 +34961,15 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@corelib_artstd.o: $(srcdir)/src/common/artstd.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/artstd.cpp
  
  @COND_USE_GUI_1@corelib_artstd.o: $(srcdir)/src/common/artstd.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/artstd.cpp
  
+@COND_USE_GUI_1@corelib_arttango.o: $(srcdir)/src/common/arttango.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/arttango.cpp
+
  @COND_USE_GUI_1@corelib_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/bmpbase.cpp
  
  @COND_USE_GUI_1@corelib_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/bmpbase.cpp
  
+@COND_USE_GUI_1@corelib_bmpbtncmn.o: $(srcdir)/src/common/bmpbtncmn.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/bmpbtncmn.cpp
+
  @COND_USE_GUI_1@corelib_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/bookctrl.cpp
  
  @COND_USE_GUI_1@corelib_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/bookctrl.cpp
  
@@ -30714,6 +34979,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@corelib_cairo.o: $(srcdir)/src/common/cairo.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/cairo.cpp
  
  @COND_USE_GUI_1@corelib_cairo.o: $(srcdir)/src/common/cairo.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/cairo.cpp
  
+@COND_USE_GUI_1@corelib_checkboxcmn.o: $(srcdir)/src/common/checkboxcmn.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/checkboxcmn.cpp
+
+@COND_USE_GUI_1@corelib_checklstcmn.o: $(srcdir)/src/common/checklstcmn.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/checklstcmn.cpp
+
  @COND_USE_GUI_1@corelib_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/choiccmn.cpp
  
  @COND_USE_GUI_1@corelib_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/choiccmn.cpp
  
@@ -30726,6 +34997,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@corelib_colourcmn.o: $(srcdir)/src/common/colourcmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/colourcmn.cpp
  
  @COND_USE_GUI_1@corelib_colourcmn.o: $(srcdir)/src/common/colourcmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/colourcmn.cpp
  
+@COND_USE_GUI_1@corelib_colourdata.o: $(srcdir)/src/common/colourdata.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/colourdata.cpp
+
  @COND_USE_GUI_1@corelib_combocmn.o: $(srcdir)/src/common/combocmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/combocmn.cpp
  
  @COND_USE_GUI_1@corelib_combocmn.o: $(srcdir)/src/common/combocmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/combocmn.cpp
  
@@ -30747,9 +35021,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@corelib_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/ctrlsub.cpp
  
  @COND_USE_GUI_1@corelib_ctrlsub.o: $(srcdir)/src/common/ctrlsub.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/ctrlsub.cpp
  
-@COND_USE_GUI_1@corelib_datacmn.o: $(srcdir)/src/common/datacmn.cpp $(CORELIB_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/datacmn.cpp
-
  @COND_USE_GUI_1@corelib_dcbase.o: $(srcdir)/src/common/dcbase.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/dcbase.cpp
  
  @COND_USE_GUI_1@corelib_dcbase.o: $(srcdir)/src/common/dcbase.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/dcbase.cpp
  
@@ -30762,6 +35033,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@corelib_dcsvg.o: $(srcdir)/src/common/dcsvg.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/dcsvg.cpp
  
  @COND_USE_GUI_1@corelib_dcsvg.o: $(srcdir)/src/common/dcsvg.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/dcsvg.cpp
  
+@COND_USE_GUI_1@corelib_dirctrlcmn.o: $(srcdir)/src/common/dirctrlcmn.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/dirctrlcmn.cpp
+
  @COND_USE_GUI_1@corelib_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp
  
  @COND_USE_GUI_1@corelib_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp
  
@@ -30792,6 +35066,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@corelib_filectrlcmn.o: $(srcdir)/src/common/filectrlcmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/filectrlcmn.cpp
  
  @COND_USE_GUI_1@corelib_filectrlcmn.o: $(srcdir)/src/common/filectrlcmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/filectrlcmn.cpp
  
+@COND_USE_GUI_1@corelib_filehistorycmn.o: $(srcdir)/src/common/filehistorycmn.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/filehistorycmn.cpp
+
  @COND_USE_GUI_1@corelib_filepickercmn.o: $(srcdir)/src/common/filepickercmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/filepickercmn.cpp
  
  @COND_USE_GUI_1@corelib_filepickercmn.o: $(srcdir)/src/common/filepickercmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/filepickercmn.cpp
  
@@ -30804,6 +35081,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@corelib_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontcmn.cpp
  
  @COND_USE_GUI_1@corelib_fontcmn.o: $(srcdir)/src/common/fontcmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontcmn.cpp
  
+@COND_USE_GUI_1@corelib_fontdata.o: $(srcdir)/src/common/fontdata.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontdata.cpp
+
+@COND_USE_GUI_1@corelib_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp
+
  @COND_USE_GUI_1@corelib_fontenumcmn.o: $(srcdir)/src/common/fontenumcmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontenumcmn.cpp
  
  @COND_USE_GUI_1@corelib_fontenumcmn.o: $(srcdir)/src/common/fontenumcmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontenumcmn.cpp
  
@@ -30834,6 +35117,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@corelib_graphcmn.o: $(srcdir)/src/common/graphcmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/graphcmn.cpp
  
  @COND_USE_GUI_1@corelib_graphcmn.o: $(srcdir)/src/common/graphcmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/graphcmn.cpp
  
+@COND_USE_GUI_1@corelib_headercolcmn.o: $(srcdir)/src/common/headercolcmn.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/headercolcmn.cpp
+
+@COND_USE_GUI_1@corelib_headerctrlcmn.o: $(srcdir)/src/common/headerctrlcmn.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/headerctrlcmn.cpp
+
  @COND_USE_GUI_1@corelib_helpbase.o: $(srcdir)/src/common/helpbase.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/helpbase.cpp
  
  @COND_USE_GUI_1@corelib_helpbase.o: $(srcdir)/src/common/helpbase.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/helpbase.cpp
  
@@ -30888,21 +35177,36 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@corelib_listctrlcmn.o: $(srcdir)/src/common/listctrlcmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/listctrlcmn.cpp
  
  @COND_USE_GUI_1@corelib_listctrlcmn.o: $(srcdir)/src/common/listctrlcmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/listctrlcmn.cpp
  
+@COND_USE_GUI_1@corelib_markupparser.o: $(srcdir)/src/common/markupparser.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/markupparser.cpp
+
  @COND_USE_GUI_1@corelib_matrix.o: $(srcdir)/src/common/matrix.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/matrix.cpp
  
  @COND_USE_GUI_1@corelib_menucmn.o: $(srcdir)/src/common/menucmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/menucmn.cpp
  
  @COND_USE_GUI_1@corelib_matrix.o: $(srcdir)/src/common/matrix.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/matrix.cpp
  
  @COND_USE_GUI_1@corelib_menucmn.o: $(srcdir)/src/common/menucmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/menucmn.cpp
  
+@COND_USE_GUI_1@corelib_mousemanager.o: $(srcdir)/src/common/mousemanager.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/mousemanager.cpp
+
  @COND_USE_GUI_1@corelib_nbkbase.o: $(srcdir)/src/common/nbkbase.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/nbkbase.cpp
  
  @COND_USE_GUI_1@corelib_overlaycmn.o: $(srcdir)/src/common/overlaycmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/overlaycmn.cpp
  
  @COND_USE_GUI_1@corelib_nbkbase.o: $(srcdir)/src/common/nbkbase.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/nbkbase.cpp
  
  @COND_USE_GUI_1@corelib_overlaycmn.o: $(srcdir)/src/common/overlaycmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/overlaycmn.cpp
  
+@COND_USE_GUI_1@corelib_ownerdrwcmn.o: $(srcdir)/src/common/ownerdrwcmn.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/ownerdrwcmn.cpp
+
  @COND_USE_GUI_1@corelib_paper.o: $(srcdir)/src/common/paper.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/paper.cpp
  
  @COND_USE_GUI_1@corelib_paper.o: $(srcdir)/src/common/paper.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/paper.cpp
  
+@COND_USE_GUI_1@corelib_panelcmn.o: $(srcdir)/src/common/panelcmn.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/panelcmn.cpp
+
+@COND_USE_GUI_1@corelib_persist.o: $(srcdir)/src/common/persist.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/persist.cpp
+
  @COND_USE_GUI_1@corelib_pickerbase.o: $(srcdir)/src/common/pickerbase.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/pickerbase.cpp
  
  @COND_USE_GUI_1@corelib_pickerbase.o: $(srcdir)/src/common/pickerbase.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/pickerbase.cpp
  
@@ -30915,27 +35219,54 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@corelib_quantize.o: $(srcdir)/src/common/quantize.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/quantize.cpp
  
  @COND_USE_GUI_1@corelib_quantize.o: $(srcdir)/src/common/quantize.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/quantize.cpp
  
+@COND_USE_GUI_1@corelib_radiobtncmn.o: $(srcdir)/src/common/radiobtncmn.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/radiobtncmn.cpp
+
  @COND_USE_GUI_1@corelib_radiocmn.o: $(srcdir)/src/common/radiocmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/radiocmn.cpp
  
  @COND_USE_GUI_1@corelib_radiocmn.o: $(srcdir)/src/common/radiocmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/radiocmn.cpp
  
+@COND_USE_GUI_1@corelib_rearrangectrl.o: $(srcdir)/src/common/rearrangectrl.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/rearrangectrl.cpp
+
  @COND_USE_GUI_1@corelib_rendcmn.o: $(srcdir)/src/common/rendcmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/rendcmn.cpp
  
  @COND_USE_GUI_1@corelib_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/rgncmn.cpp
  
  @COND_USE_GUI_1@corelib_rendcmn.o: $(srcdir)/src/common/rendcmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/rendcmn.cpp
  
  @COND_USE_GUI_1@corelib_rgncmn.o: $(srcdir)/src/common/rgncmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/rgncmn.cpp
  
+@COND_USE_GUI_1@corelib_scrolbarcmn.o: $(srcdir)/src/common/scrolbarcmn.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/scrolbarcmn.cpp
+
  @COND_USE_GUI_1@corelib_settcmn.o: $(srcdir)/src/common/settcmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/settcmn.cpp
  
  @COND_USE_GUI_1@corelib_sizer.o: $(srcdir)/src/common/sizer.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
  
  @COND_USE_GUI_1@corelib_settcmn.o: $(srcdir)/src/common/settcmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/settcmn.cpp
  
  @COND_USE_GUI_1@corelib_sizer.o: $(srcdir)/src/common/sizer.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
  
+@COND_USE_GUI_1@corelib_slidercmn.o: $(srcdir)/src/common/slidercmn.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/slidercmn.cpp
+
+@COND_USE_GUI_1@corelib_spinbtncmn.o: $(srcdir)/src/common/spinbtncmn.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/spinbtncmn.cpp
+
+@COND_USE_GUI_1@corelib_spinctrlcmn.o: $(srcdir)/src/common/spinctrlcmn.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/spinctrlcmn.cpp
+
  @COND_USE_GUI_1@corelib_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp
  
  @COND_USE_GUI_1@corelib_statbar.o: $(srcdir)/src/common/statbar.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/statbar.cpp
  
  @COND_USE_GUI_1@corelib_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp
  
  @COND_USE_GUI_1@corelib_statbar.o: $(srcdir)/src/common/statbar.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/statbar.cpp
  
+@COND_USE_GUI_1@corelib_statbmpcmn.o: $(srcdir)/src/common/statbmpcmn.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/statbmpcmn.cpp
+
+@COND_USE_GUI_1@corelib_statboxcmn.o: $(srcdir)/src/common/statboxcmn.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/statboxcmn.cpp
+
+@COND_USE_GUI_1@corelib_statlinecmn.o: $(srcdir)/src/common/statlinecmn.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/statlinecmn.cpp
+
  @COND_USE_GUI_1@corelib_stattextcmn.o: $(srcdir)/src/common/stattextcmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/stattextcmn.cpp
  
  @COND_USE_GUI_1@corelib_stattextcmn.o: $(srcdir)/src/common/stattextcmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/stattextcmn.cpp
  
@@ -30957,6 +35288,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@corelib_treebase.o: $(srcdir)/src/common/treebase.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/treebase.cpp
  
  @COND_USE_GUI_1@corelib_treebase.o: $(srcdir)/src/common/treebase.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/treebase.cpp
  
+@COND_USE_GUI_1@corelib_uiactioncmn.o: $(srcdir)/src/common/uiactioncmn.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/uiactioncmn.cpp
+
  @COND_USE_GUI_1@corelib_valgen.o: $(srcdir)/src/common/valgen.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/valgen.cpp
  
  @COND_USE_GUI_1@corelib_valgen.o: $(srcdir)/src/common/valgen.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/valgen.cpp
  
@@ -30966,6 +35300,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@corelib_valtext.o: $(srcdir)/src/common/valtext.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/valtext.cpp
  
  @COND_USE_GUI_1@corelib_valtext.o: $(srcdir)/src/common/valtext.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/valtext.cpp
  
+@COND_USE_GUI_1@corelib_valnum.o: $(srcdir)/src/common/valnum.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/valnum.cpp
+
  @COND_USE_GUI_1@corelib_wincmn.o: $(srcdir)/src/common/wincmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/wincmn.cpp
  
  @COND_USE_GUI_1@corelib_wincmn.o: $(srcdir)/src/common/wincmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/wincmn.cpp
  
@@ -31005,12 +35342,24 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@corelib_filectrlg.o: $(srcdir)/src/generic/filectrlg.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filectrlg.cpp
  
  @COND_USE_GUI_1@corelib_filectrlg.o: $(srcdir)/src/generic/filectrlg.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/filectrlg.cpp
  
+@COND_USE_GUI_1@corelib_headerctrlg.o: $(srcdir)/src/generic/headerctrlg.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/headerctrlg.cpp
+
+@COND_USE_GUI_1@corelib_generic_infobar.o: $(srcdir)/src/generic/infobar.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/infobar.cpp
+
  @COND_USE_GUI_1@corelib_listbkg.o: $(srcdir)/src/generic/listbkg.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listbkg.cpp
  
  @COND_USE_GUI_1@corelib_logg.o: $(srcdir)/src/generic/logg.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/logg.cpp
  
  @COND_USE_GUI_1@corelib_listbkg.o: $(srcdir)/src/generic/listbkg.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listbkg.cpp
  
  @COND_USE_GUI_1@corelib_logg.o: $(srcdir)/src/generic/logg.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/logg.cpp
  
+@COND_USE_GUI_1@corelib_markuptext.o: $(srcdir)/src/generic/markuptext.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/markuptext.cpp
+
+@COND_USE_GUI_1@corelib_msgdlgg.o: $(srcdir)/src/generic/msgdlgg.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/msgdlgg.cpp
+
  @COND_USE_GUI_1@corelib_numdlgg.o: $(srcdir)/src/generic/numdlgg.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/numdlgg.cpp
  
  @COND_USE_GUI_1@corelib_numdlgg.o: $(srcdir)/src/generic/numdlgg.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/numdlgg.cpp
  
@@ -31026,6 +35375,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@corelib_renderg.o: $(srcdir)/src/generic/renderg.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/renderg.cpp
  
  @COND_USE_GUI_1@corelib_renderg.o: $(srcdir)/src/generic/renderg.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/renderg.cpp
  
+@COND_USE_GUI_1@corelib_richmsgdlgg.o: $(srcdir)/src/generic/richmsgdlgg.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/richmsgdlgg.cpp
+
  @COND_USE_GUI_1@corelib_scrlwing.o: $(srcdir)/src/generic/scrlwing.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/scrlwing.cpp
  
  @COND_USE_GUI_1@corelib_scrlwing.o: $(srcdir)/src/generic/scrlwing.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/scrlwing.cpp
  
@@ -31044,6 +35396,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@corelib_statbmpg.o: $(srcdir)/src/generic/statbmpg.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statbmpg.cpp
  
  @COND_USE_GUI_1@corelib_statbmpg.o: $(srcdir)/src/generic/statbmpg.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/statbmpg.cpp
  
+@COND_USE_GUI_1@corelib_stattextg.o: $(srcdir)/src/generic/stattextg.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/stattextg.cpp
+
  @COND_USE_GUI_1@corelib_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp
  
  @COND_USE_GUI_1@corelib_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp
  
@@ -31066,12 +35421,24 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/vscroll.cpp
  
  advdll_version_rc.o: $(srcdir)/src/msw/version.rc $(ADVDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/vscroll.cpp
  
  advdll_version_rc.o: $(srcdir)/src/msw/version.rc $(ADVDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_54)  $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_55) $(__INC_REGEX_p_53) $(__INC_EXPAT_p_53) --define WXUSINGDLL --define WXMAKINGDLL_ADV
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66)  $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_ADV
+
+advdll_gtk_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(ADVDLL_ODEP)
+       $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp
  
  advdll_animate.o: $(srcdir)/src/gtk/animate.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/animate.cpp
  
  
  advdll_animate.o: $(srcdir)/src/gtk/animate.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/animate.cpp
  
-advdll_hyperlink.o: $(srcdir)/src/gtk/hyperlink.cpp $(ADVDLL_ODEP)
+advdll_gtk_bmpcbox.o: $(srcdir)/src/gtk/bmpcbox.cpp $(ADVDLL_ODEP)
+       $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/bmpcbox.cpp
+
+advdll_gtk_calctrl.o: $(srcdir)/src/gtk/calctrl.cpp $(ADVDLL_ODEP)
+       $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/calctrl.cpp
+
+advdll_gtk_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(ADVDLL_ODEP)
+       $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/dataview.cpp
+
+advdll_gtk_hyperlink.o: $(srcdir)/src/gtk/hyperlink.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/hyperlink.cpp
  
  advdll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/hyperlink.cpp
  
  advdll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVDLL_ODEP)
@@ -31089,18 +35456,30 @@ advdll_calctrlcmn.o: $(srcdir)/src/common/calctrlcmn.cpp $(ADVDLL_ODEP)
  advdll_datavcmn.o: $(srcdir)/src/common/datavcmn.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/common/datavcmn.cpp
  
  advdll_datavcmn.o: $(srcdir)/src/common/datavcmn.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/common/datavcmn.cpp
  
+advdll_gridcmn.o: $(srcdir)/src/common/gridcmn.cpp $(ADVDLL_ODEP)
+       $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/common/gridcmn.cpp
+
  advdll_hyperlnkcmn.o: $(srcdir)/src/common/hyperlnkcmn.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/common/hyperlnkcmn.cpp
  
  advdll_hyperlnkcmn.o: $(srcdir)/src/common/hyperlnkcmn.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/common/hyperlnkcmn.cpp
  
+advdll_odcombocmn.o: $(srcdir)/src/common/odcombocmn.cpp $(ADVDLL_ODEP)
+       $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/common/odcombocmn.cpp
+
  advdll_aboutdlgg.o: $(srcdir)/src/generic/aboutdlgg.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/aboutdlgg.cpp
  
  advdll_aboutdlgg.o: $(srcdir)/src/generic/aboutdlgg.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/aboutdlgg.cpp
  
+advdll_bannerwindow.o: $(srcdir)/src/generic/bannerwindow.cpp $(ADVDLL_ODEP)
+       $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/bannerwindow.cpp
+
  advdll_bmpcboxg.o: $(srcdir)/src/generic/bmpcboxg.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/bmpcboxg.cpp
  
  advdll_calctrlg.o: $(srcdir)/src/generic/calctrlg.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/calctrlg.cpp
  
  advdll_bmpcboxg.o: $(srcdir)/src/generic/bmpcboxg.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/bmpcboxg.cpp
  
  advdll_calctrlg.o: $(srcdir)/src/generic/calctrlg.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/calctrlg.cpp
  
+advdll_commandlinkbuttong.o: $(srcdir)/src/generic/commandlinkbuttong.cpp $(ADVDLL_ODEP)
+       $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/commandlinkbuttong.cpp
+
  advdll_datavgen.o: $(srcdir)/src/generic/datavgen.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/datavgen.cpp
  
  advdll_datavgen.o: $(srcdir)/src/generic/datavgen.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/datavgen.cpp
  
@@ -31116,6 +35495,9 @@ advdll_grid.o: $(srcdir)/src/generic/grid.cpp $(ADVDLL_ODEP)
  advdll_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/gridctrl.cpp
  
  advdll_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/gridctrl.cpp
  
+advdll_grideditors.o: $(srcdir)/src/generic/grideditors.cpp $(ADVDLL_ODEP)
+       $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/grideditors.cpp
+
  advdll_gridsel.o: $(srcdir)/src/generic/gridsel.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/gridsel.cpp
  
  advdll_gridsel.o: $(srcdir)/src/generic/gridsel.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/gridsel.cpp
  
@@ -31146,6 +35528,9 @@ advdll_splash.o: $(srcdir)/src/generic/splash.cpp $(ADVDLL_ODEP)
  advdll_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/tipdlg.cpp
  
  advdll_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/tipdlg.cpp
  
+advdll_treelist.o: $(srcdir)/src/generic/treelist.cpp $(ADVDLL_ODEP)
+       $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/treelist.cpp
+
  advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/wizard.cpp
  
  advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/wizard.cpp
  
@@ -31179,11 +35564,38 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advdll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVDLL_ODEP)
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
  
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advdll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVDLL_ODEP)
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
  
-@COND_TOOLKIT_MSW@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+@COND_TOOLKIT_MSW@advdll_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
+
+@COND_TOOLKIT_WINCE@advdll_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
+
+@COND_TOOLKIT_MSW@advdll_msw_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
+
+@COND_TOOLKIT_WINCE@advdll_msw_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
+
+@COND_TOOLKIT_MSW@advdll_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/sound.cpp
+
+@COND_TOOLKIT_WINCE@advdll_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/sound.cpp
+
+@COND_TOOLKIT_MSW@advdll_msw_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
+
+@COND_TOOLKIT_WINCE@advdll_msw_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
+
+@COND_TOOLKIT_MSW@advdll_msw_joystick.o: $(srcdir)/src/msw/joystick.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp
+
+@COND_TOOLKIT_MSW_WXUNIV_0@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_MSW_WXUNIV_0@    $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
  
-@COND_TOOLKIT_WINCE@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+@COND_TOOLKIT_WINCE_WXUNIV_0@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_WINCE_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
  @COND_TOOLKIT_OSX_CARBON@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
  @COND_TOOLKIT_OSX_CARBON@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
@@ -31191,6 +35603,9 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_OSX_COCOA@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
  @COND_TOOLKIT_OSX_COCOA@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
+@COND_TOOLKIT_OSX_IPHONE@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_IPHONE@      $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+
  @COND_TOOLKIT_COCOA@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
  @COND_TOOLKIT_COCOA@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
@@ -31206,119 +35621,95 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
  @COND_WXUNIV_1@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP)
  @COND_WXUNIV_1@        $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
  @COND_WXUNIV_1@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP)
  @COND_WXUNIV_1@        $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
-@COND_TOOLKIT_MSW@advdll_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
-
-@COND_TOOLKIT_WINCE@advdll_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
-
-@COND_TOOLKIT_OSX_CARBON@advdll_aboutdlg.o: $(srcdir)/src/osx/carbon/aboutdlg.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON@advdll_carbon_aboutdlg.o: $(srcdir)/src/osx/carbon/aboutdlg.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/aboutdlg.cpp
  
  @COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/aboutdlg.cpp
  
-@COND_TOOLKIT_OSX_COCOA@advdll_aboutdlg.o: $(srcdir)/src/osx/cocoa/aboutdlg.mm $(ADVDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/aboutdlg.mm
+@COND_TOOLKIT_OSX_CARBON@advdll_drawer.o: $(srcdir)/src/osx/carbon/drawer.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/drawer.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@advdll_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp
+@COND_TOOLKIT_OSX_CARBON@advdll_dataview_osx.o: $(srcdir)/src/osx/dataview_osx.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/dataview_osx.cpp
  
  
-@COND_TOOLKIT_MSW@advdll_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
+@COND_TOOLKIT_OSX_COCOA@advdll_dataview_osx.o: $(srcdir)/src/osx/dataview_osx.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/dataview_osx.cpp
  
  
-@COND_TOOLKIT_WINCE@advdll_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
+@COND_TOOLKIT_OSX_CARBON@advdll_carbon_dataview.o: $(srcdir)/src/osx/carbon/dataview.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dataview.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_notifmsg.o: $(srcdir)/src/gtk/hildon/notifmsg.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/hildon/notifmsg.cpp
+@COND_TOOLKIT_OSX_CARBON@advdll_sound_osx.o: $(srcdir)/src/osx/sound_osx.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/sound_osx.cpp
  
  
-@COND_TOOLKIT_MSW@advdll_sound.o: $(srcdir)/src/msw/sound.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/sound.cpp
+@COND_TOOLKIT_OSX_COCOA@advdll_sound_osx.o: $(srcdir)/src/osx/sound_osx.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/sound_osx.cpp
  
  
-@COND_TOOLKIT_WINCE@advdll_sound.o: $(srcdir)/src/msw/sound.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/sound.cpp
+@COND_TOOLKIT_OSX_IPHONE@advdll_sound_osx.o: $(srcdir)/src/osx/sound_osx.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_IPHONE@      $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/sound_osx.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON@advdll_sound.o: $(srcdir)/src/osx/carbon/sound.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON@advdll_carbon_sound.o: $(srcdir)/src/osx/carbon/sound.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/sound.cpp
  
  @COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/sound.cpp
  
-@COND_TOOLKIT_MOTIF@advdll_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advdll_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
-
-@COND_TOOLKIT_X11@advdll_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_TOOLKIT_OSX_COCOA@advdll_carbon_sound.o: $(srcdir)/src/osx/carbon/sound.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/sound.cpp
  
  
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advdll_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_TOOLKIT_OSX_CARBON@advdll_carbon_taskbar.o: $(srcdir)/src/osx/carbon/taskbar.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/taskbar.cpp
  
  
-@COND_TOOLKIT_PM@advdll_sound.o: $(srcdir)/src/os2/sound.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_PM@      $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/os2/sound.cpp
+@COND_TOOLKIT_OSX_CARBON@advdll_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
  
  
-@COND_TOOLKIT_MSW@advdll_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
+@COND_TOOLKIT_OSX_COCOA@advdll_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
  
  
-@COND_TOOLKIT_WINCE@advdll_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
+@COND_TOOLKIT_COCOA@advdll_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON@advdll_taskbar.o: $(srcdir)/src/osx/carbon/taskbar.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/taskbar.cpp
+@COND_TOOLKIT_OSX_COCOA@advdll_core_sound.o: $(srcdir)/src/osx/core/sound.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/core/sound.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA@advdll_taskbar.o: $(srcdir)/src/osx/carbon/taskbar.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/taskbar.cpp
+@COND_TOOLKIT_OSX_IPHONE@advdll_core_sound.o: $(srcdir)/src/osx/core/sound.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_IPHONE@      $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/core/sound.cpp
  
  
-@COND_TOOLKIT_COCOA@advdll_taskbar.o: $(srcdir)/src/cocoa/taskbar.mm $(ADVDLL_ODEP)
-@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/cocoa/taskbar.mm
+@COND_TOOLKIT_OSX_COCOA@advdll_cocoa_aboutdlg.o: $(srcdir)/src/osx/cocoa/aboutdlg.mm $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(ADVDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/aboutdlg.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_taskbar.o: $(srcdir)/src/gtk/taskbar.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/taskbar.cpp
+@COND_TOOLKIT_OSX_COCOA@advdll_cocoa_dataview.o: $(srcdir)/src/osx/cocoa/dataview.mm $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(ADVDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dataview.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advdll_taskbar.o: $(srcdir)/src/gtk1/taskbar.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk1/taskbar.cpp
+@COND_TOOLKIT_OSX_COCOA@advdll_osx_cocoa_taskbar.o: $(srcdir)/src/osx/cocoa/taskbar.mm $(ADVDLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(ADVDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/taskbar.mm
  
  
-@COND_TOOLKIT_MSW@advdll_joystick.o: $(srcdir)/src/msw/joystick.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp
+@COND_TOOLKIT_COCOA@advdll_src_cocoa_taskbar.o: $(srcdir)/src/cocoa/taskbar.mm $(ADVDLL_ODEP)
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(ADVDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/taskbar.mm
  
  
-@COND_TOOLKIT_MOTIF@advdll_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_MOTIF@advdll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
  @COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advdll_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advdll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
-@COND_TOOLKIT_X11@advdll_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_X11@advdll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
  @COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advdll_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVDLL_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advdll_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVDLL_ODEP)
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
-@COND_TOOLKIT_PM@advdll_joystick.o: $(srcdir)/src/os2/joystick.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_PM@      $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/os2/joystick.cpp
-
-@COND_TOOLKIT_OSX_CARBON@advdll_drawer.o: $(srcdir)/src/osx/carbon/drawer.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/drawer.cpp
-
-@COND_TOOLKIT_OSX_CARBON@advdll_dataview.o: $(srcdir)/src/osx/carbon/dataview.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dataview.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@advdll_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/dataview.cpp
+@COND_TOOLKIT_MOTIF@advdll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON@advdll_databrow.o: $(srcdir)/src/osx/carbon/databrow.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/databrow.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON@advdll_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advdll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA@advdll_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
+@COND_TOOLKIT_X11@advdll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
  
  
-@COND_TOOLKIT_COCOA@advdll_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advdll_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
  
  @COND_TOOLKIT_MOTIF@advdll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
  
  @COND_TOOLKIT_MOTIF@advdll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
@@ -31335,30 +35726,45 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advdll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVDLL_ODEP)
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
  
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advdll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVDLL_ODEP)
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(ADVDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_gtk_taskbar.o: $(srcdir)/src/gtk/taskbar.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/taskbar.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_gtk_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(ADVDLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CCC) -c -o $@ $(ADVDLL_CFLAGS) $(srcdir)/src/gtk/eggtrayicon.c
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CCC) -c -o $@ $(ADVDLL_CFLAGS) $(srcdir)/src/gtk/eggtrayicon.c
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advdll_eggtrayicon.o: $(srcdir)/src/gtk1/eggtrayicon.c $(ADVDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_hildon_notifmsg.o: $(srcdir)/src/gtk/hildon/notifmsg.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/hildon/notifmsg.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advdll_gtk1_eggtrayicon.o: $(srcdir)/src/gtk1/eggtrayicon.c $(ADVDLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    $(CCC) -c -o $@ $(ADVDLL_CFLAGS) $(srcdir)/src/gtk1/eggtrayicon.c
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    $(CCC) -c -o $@ $(ADVDLL_CFLAGS) $(srcdir)/src/gtk1/eggtrayicon.c
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@advdll_bmpcbox.o: $(srcdir)/src/gtk/bmpcbox.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/bmpcbox.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advdll_gtk1_taskbar.o: $(srcdir)/src/gtk1/taskbar.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk1/taskbar.cpp
+
+@COND_TOOLKIT_PM@advdll_os2_joystick.o: $(srcdir)/src/os2/joystick.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_PM@      $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/os2/joystick.cpp
+
+@COND_TOOLKIT_PM@advdll_os2_sound.o: $(srcdir)/src/os2/sound.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_PM@      $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/os2/sound.cpp
  
  
-@COND_TOOLKIT_MSW_WXUNIV_0@advdll_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_MSW_WXUNIV_0@advdll_msw_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_MSW_WXUNIV_0@    $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/bmpcbox.cpp
  
  @COND_TOOLKIT_MSW_WXUNIV_0@    $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/bmpcbox.cpp
  
-@COND_TOOLKIT_WINCE_WXUNIV_0@advdll_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_WINCE_WXUNIV_0@advdll_msw_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_WINCE_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/bmpcbox.cpp
  
  @COND_TOOLKIT_WINCE_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/bmpcbox.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@advdll_calctrl.o: $(srcdir)/src/gtk/calctrl.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/calctrl.cpp
-
-@COND_TOOLKIT_MSW_WXUNIV_0@advdll_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_MSW_WXUNIV_0@advdll_msw_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_MSW_WXUNIV_0@    $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
  
  @COND_TOOLKIT_MSW_WXUNIV_0@    $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
  
-@COND_TOOLKIT_WINCE_WXUNIV_0@advdll_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_WINCE_WXUNIV_0@advdll_msw_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_WINCE_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
  
  @COND_TOOLKIT_WINCE_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
  
+@COND_TOOLKIT_MSW_WXUNIV_0@advdll_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_MSW_WXUNIV_0@    $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
+
+@COND_TOOLKIT_WINCE_WXUNIV_0@advdll_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_WINCE_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
+
  @COND_TOOLKIT_MSW_WXUNIV_0@advdll_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_MSW_WXUNIV_0@    $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp
  
  @COND_TOOLKIT_MSW_WXUNIV_0@advdll_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_MSW_WXUNIV_0@    $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp
  
@@ -31371,10 +35777,28 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_WINCE_WXUNIV_0@advdll_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_WINCE_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp
  
  @COND_TOOLKIT_WINCE_WXUNIV_0@advdll_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_WINCE_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp
  
+@COND_TOOLKIT_MSW_WXUNIV_0@advdll_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_MSW_WXUNIV_0@    $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp
+
+@COND_TOOLKIT_WINCE_WXUNIV_0@advdll_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_WINCE_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp
+
+advlib_gtk_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(ADVLIB_ODEP)
+       $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp
+
  advlib_animate.o: $(srcdir)/src/gtk/animate.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/animate.cpp
  
  advlib_animate.o: $(srcdir)/src/gtk/animate.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/animate.cpp
  
-advlib_hyperlink.o: $(srcdir)/src/gtk/hyperlink.cpp $(ADVLIB_ODEP)
+advlib_gtk_bmpcbox.o: $(srcdir)/src/gtk/bmpcbox.cpp $(ADVLIB_ODEP)
+       $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/bmpcbox.cpp
+
+advlib_gtk_calctrl.o: $(srcdir)/src/gtk/calctrl.cpp $(ADVLIB_ODEP)
+       $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/calctrl.cpp
+
+advlib_gtk_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(ADVLIB_ODEP)
+       $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/dataview.cpp
+
+advlib_gtk_hyperlink.o: $(srcdir)/src/gtk/hyperlink.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/hyperlink.cpp
  
  advlib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/hyperlink.cpp
  
  advlib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVLIB_ODEP)
@@ -31392,18 +35816,30 @@ advlib_calctrlcmn.o: $(srcdir)/src/common/calctrlcmn.cpp $(ADVLIB_ODEP)
  advlib_datavcmn.o: $(srcdir)/src/common/datavcmn.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/common/datavcmn.cpp
  
  advlib_datavcmn.o: $(srcdir)/src/common/datavcmn.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/common/datavcmn.cpp
  
+advlib_gridcmn.o: $(srcdir)/src/common/gridcmn.cpp $(ADVLIB_ODEP)
+       $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/common/gridcmn.cpp
+
  advlib_hyperlnkcmn.o: $(srcdir)/src/common/hyperlnkcmn.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/common/hyperlnkcmn.cpp
  
  advlib_hyperlnkcmn.o: $(srcdir)/src/common/hyperlnkcmn.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/common/hyperlnkcmn.cpp
  
+advlib_odcombocmn.o: $(srcdir)/src/common/odcombocmn.cpp $(ADVLIB_ODEP)
+       $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/common/odcombocmn.cpp
+
  advlib_aboutdlgg.o: $(srcdir)/src/generic/aboutdlgg.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/aboutdlgg.cpp
  
  advlib_aboutdlgg.o: $(srcdir)/src/generic/aboutdlgg.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/aboutdlgg.cpp
  
+advlib_bannerwindow.o: $(srcdir)/src/generic/bannerwindow.cpp $(ADVLIB_ODEP)
+       $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/bannerwindow.cpp
+
  advlib_bmpcboxg.o: $(srcdir)/src/generic/bmpcboxg.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/bmpcboxg.cpp
  
  advlib_calctrlg.o: $(srcdir)/src/generic/calctrlg.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/calctrlg.cpp
  
  advlib_bmpcboxg.o: $(srcdir)/src/generic/bmpcboxg.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/bmpcboxg.cpp
  
  advlib_calctrlg.o: $(srcdir)/src/generic/calctrlg.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/calctrlg.cpp
  
+advlib_commandlinkbuttong.o: $(srcdir)/src/generic/commandlinkbuttong.cpp $(ADVLIB_ODEP)
+       $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/commandlinkbuttong.cpp
+
  advlib_datavgen.o: $(srcdir)/src/generic/datavgen.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/datavgen.cpp
  
  advlib_datavgen.o: $(srcdir)/src/generic/datavgen.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/datavgen.cpp
  
@@ -31419,6 +35855,9 @@ advlib_grid.o: $(srcdir)/src/generic/grid.cpp $(ADVLIB_ODEP)
  advlib_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/gridctrl.cpp
  
  advlib_gridctrl.o: $(srcdir)/src/generic/gridctrl.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/gridctrl.cpp
  
+advlib_grideditors.o: $(srcdir)/src/generic/grideditors.cpp $(ADVLIB_ODEP)
+       $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/grideditors.cpp
+
  advlib_gridsel.o: $(srcdir)/src/generic/gridsel.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/gridsel.cpp
  
  advlib_gridsel.o: $(srcdir)/src/generic/gridsel.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/gridsel.cpp
  
@@ -31449,6 +35888,9 @@ advlib_splash.o: $(srcdir)/src/generic/splash.cpp $(ADVLIB_ODEP)
  advlib_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/tipdlg.cpp
  
  advlib_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/tipdlg.cpp
  
+advlib_treelist.o: $(srcdir)/src/generic/treelist.cpp $(ADVLIB_ODEP)
+       $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/treelist.cpp
+
  advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/wizard.cpp
  
  advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/wizard.cpp
  
@@ -31482,11 +35924,38 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advlib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVLIB_ODEP)
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
  
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advlib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVLIB_ODEP)
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
  
-@COND_TOOLKIT_MSW@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+@COND_TOOLKIT_MSW@advlib_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
+
+@COND_TOOLKIT_WINCE@advlib_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
+
+@COND_TOOLKIT_MSW@advlib_msw_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
+
+@COND_TOOLKIT_WINCE@advlib_msw_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
+
+@COND_TOOLKIT_MSW@advlib_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/sound.cpp
+
+@COND_TOOLKIT_WINCE@advlib_msw_sound.o: $(srcdir)/src/msw/sound.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/sound.cpp
+
+@COND_TOOLKIT_MSW@advlib_msw_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
+
+@COND_TOOLKIT_WINCE@advlib_msw_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
+
+@COND_TOOLKIT_MSW@advlib_msw_joystick.o: $(srcdir)/src/msw/joystick.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp
+
+@COND_TOOLKIT_MSW_WXUNIV_0@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_MSW_WXUNIV_0@    $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
  
-@COND_TOOLKIT_WINCE@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+@COND_TOOLKIT_WINCE_WXUNIV_0@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_WINCE_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
  @COND_TOOLKIT_OSX_CARBON@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
  @COND_TOOLKIT_OSX_CARBON@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
@@ -31494,6 +35963,9 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_OSX_COCOA@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
  @COND_TOOLKIT_OSX_COCOA@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
+@COND_TOOLKIT_OSX_IPHONE@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_IPHONE@      $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+
  @COND_TOOLKIT_COCOA@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
  @COND_TOOLKIT_COCOA@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
@@ -31509,119 +35981,95 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
  @COND_WXUNIV_1@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP)
  @COND_WXUNIV_1@        $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
  @COND_WXUNIV_1@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP)
  @COND_WXUNIV_1@        $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
  
-@COND_TOOLKIT_MSW@advlib_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
-
-@COND_TOOLKIT_WINCE@advlib_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
-
-@COND_TOOLKIT_OSX_CARBON@advlib_aboutdlg.o: $(srcdir)/src/osx/carbon/aboutdlg.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON@advlib_carbon_aboutdlg.o: $(srcdir)/src/osx/carbon/aboutdlg.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/aboutdlg.cpp
  
  @COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/aboutdlg.cpp
  
-@COND_TOOLKIT_OSX_COCOA@advlib_aboutdlg.o: $(srcdir)/src/osx/cocoa/aboutdlg.mm $(ADVLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/aboutdlg.mm
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@advlib_aboutdlg.o: $(srcdir)/src/gtk/aboutdlg.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/aboutdlg.cpp
-
-@COND_TOOLKIT_MSW@advlib_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
-
-@COND_TOOLKIT_WINCE@advlib_notifmsg.o: $(srcdir)/src/msw/notifmsg.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/notifmsg.cpp
+@COND_TOOLKIT_OSX_CARBON@advlib_drawer.o: $(srcdir)/src/osx/carbon/drawer.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/drawer.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_notifmsg.o: $(srcdir)/src/gtk/hildon/notifmsg.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/hildon/notifmsg.cpp
+@COND_TOOLKIT_OSX_CARBON@advlib_dataview_osx.o: $(srcdir)/src/osx/dataview_osx.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/dataview_osx.cpp
  
  
-@COND_TOOLKIT_MSW@advlib_sound.o: $(srcdir)/src/msw/sound.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/sound.cpp
+@COND_TOOLKIT_OSX_COCOA@advlib_dataview_osx.o: $(srcdir)/src/osx/dataview_osx.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/dataview_osx.cpp
  
  
-@COND_TOOLKIT_WINCE@advlib_sound.o: $(srcdir)/src/msw/sound.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/sound.cpp
+@COND_TOOLKIT_OSX_CARBON@advlib_carbon_dataview.o: $(srcdir)/src/osx/carbon/dataview.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dataview.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON@advlib_sound.o: $(srcdir)/src/osx/carbon/sound.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/sound.cpp
+@COND_TOOLKIT_OSX_CARBON@advlib_sound_osx.o: $(srcdir)/src/osx/sound_osx.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/sound_osx.cpp
  
  
-@COND_TOOLKIT_MOTIF@advlib_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_TOOLKIT_OSX_COCOA@advlib_sound_osx.o: $(srcdir)/src/osx/sound_osx.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/sound_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_TOOLKIT_OSX_IPHONE@advlib_sound_osx.o: $(srcdir)/src/osx/sound_osx.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_IPHONE@      $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/sound_osx.cpp
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advlib_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_TOOLKIT_OSX_CARBON@advlib_carbon_sound.o: $(srcdir)/src/osx/carbon/sound.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/sound.cpp
  
  
-@COND_TOOLKIT_X11@advlib_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_TOOLKIT_OSX_COCOA@advlib_carbon_sound.o: $(srcdir)/src/osx/carbon/sound.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/sound.cpp
  
  
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advlib_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
+@COND_TOOLKIT_OSX_CARBON@advlib_carbon_taskbar.o: $(srcdir)/src/osx/carbon/taskbar.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/taskbar.cpp
  
  
-@COND_TOOLKIT_PM@advlib_sound.o: $(srcdir)/src/os2/sound.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_PM@      $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/os2/sound.cpp
+@COND_TOOLKIT_OSX_CARBON@advlib_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
  
  
-@COND_TOOLKIT_MSW@advlib_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
+@COND_TOOLKIT_OSX_COCOA@advlib_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
  
  
-@COND_TOOLKIT_WINCE@advlib_taskbar.o: $(srcdir)/src/msw/taskbar.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/taskbar.cpp
+@COND_TOOLKIT_COCOA@advlib_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON@advlib_taskbar.o: $(srcdir)/src/osx/carbon/taskbar.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/taskbar.cpp
+@COND_TOOLKIT_OSX_COCOA@advlib_core_sound.o: $(srcdir)/src/osx/core/sound.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/core/sound.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA@advlib_taskbar.o: $(srcdir)/src/osx/carbon/taskbar.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/taskbar.cpp
+@COND_TOOLKIT_OSX_IPHONE@advlib_core_sound.o: $(srcdir)/src/osx/core/sound.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_IPHONE@      $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/core/sound.cpp
  
  
-@COND_TOOLKIT_COCOA@advlib_taskbar.o: $(srcdir)/src/cocoa/taskbar.mm $(ADVLIB_ODEP)
-@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/cocoa/taskbar.mm
+@COND_TOOLKIT_OSX_COCOA@advlib_cocoa_aboutdlg.o: $(srcdir)/src/osx/cocoa/aboutdlg.mm $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(ADVLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/aboutdlg.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_taskbar.o: $(srcdir)/src/gtk/taskbar.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/taskbar.cpp
+@COND_TOOLKIT_OSX_COCOA@advlib_cocoa_dataview.o: $(srcdir)/src/osx/cocoa/dataview.mm $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(ADVLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/dataview.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advlib_taskbar.o: $(srcdir)/src/gtk1/taskbar.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk1/taskbar.cpp
+@COND_TOOLKIT_OSX_COCOA@advlib_osx_cocoa_taskbar.o: $(srcdir)/src/osx/cocoa/taskbar.mm $(ADVLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(ADVLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/taskbar.mm
  
  
-@COND_TOOLKIT_MSW@advlib_joystick.o: $(srcdir)/src/msw/joystick.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/joystick.cpp
+@COND_TOOLKIT_COCOA@advlib_src_cocoa_taskbar.o: $(srcdir)/src/cocoa/taskbar.mm $(ADVLIB_ODEP)
+@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(ADVLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/taskbar.mm
  
  
-@COND_TOOLKIT_MOTIF@advlib_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_MOTIF@advlib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
  @COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advlib_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advlib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
-@COND_TOOLKIT_X11@advlib_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_X11@advlib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
  @COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
-@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advlib_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVLIB_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advlib_unix_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVLIB_ODEP)
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/joystick.cpp
  
-@COND_TOOLKIT_PM@advlib_joystick.o: $(srcdir)/src/os2/joystick.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_PM@      $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/os2/joystick.cpp
-
-@COND_TOOLKIT_OSX_CARBON@advlib_drawer.o: $(srcdir)/src/osx/carbon/drawer.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/drawer.cpp
-
-@COND_TOOLKIT_OSX_CARBON@advlib_dataview.o: $(srcdir)/src/osx/carbon/dataview.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dataview.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@advlib_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/dataview.cpp
+@COND_TOOLKIT_MOTIF@advlib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON@advlib_databrow.o: $(srcdir)/src/osx/carbon/databrow.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/databrow.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON@advlib_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advlib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
  
  
-@COND_TOOLKIT_OSX_COCOA@advlib_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
+@COND_TOOLKIT_X11@advlib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
  
  
-@COND_TOOLKIT_COCOA@advlib_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advlib_unix_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound.cpp
  
  @COND_TOOLKIT_MOTIF@advlib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
  
  @COND_TOOLKIT_MOTIF@advlib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
@@ -31638,30 +36086,45 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advlib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVLIB_ODEP)
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
  
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL@advlib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVLIB_ODEP)
  @COND_PLATFORM_UNIX_1_TOOLKIT_MGL@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(ADVLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_gtk_taskbar.o: $(srcdir)/src/gtk/taskbar.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/taskbar.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_gtk_eggtrayicon.o: $(srcdir)/src/gtk/eggtrayicon.c $(ADVLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CCC) -c -o $@ $(ADVLIB_CFLAGS) $(srcdir)/src/gtk/eggtrayicon.c
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CCC) -c -o $@ $(ADVLIB_CFLAGS) $(srcdir)/src/gtk/eggtrayicon.c
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advlib_eggtrayicon.o: $(srcdir)/src/gtk1/eggtrayicon.c $(ADVLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_hildon_notifmsg.o: $(srcdir)/src/gtk/hildon/notifmsg.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/hildon/notifmsg.cpp
+
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advlib_gtk1_eggtrayicon.o: $(srcdir)/src/gtk1/eggtrayicon.c $(ADVLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    $(CCC) -c -o $@ $(ADVLIB_CFLAGS) $(srcdir)/src/gtk1/eggtrayicon.c
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    $(CCC) -c -o $@ $(ADVLIB_CFLAGS) $(srcdir)/src/gtk1/eggtrayicon.c
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@advlib_bmpcbox.o: $(srcdir)/src/gtk/bmpcbox.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/bmpcbox.cpp
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advlib_gtk1_taskbar.o: $(srcdir)/src/gtk1/taskbar.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk1/taskbar.cpp
+
+@COND_TOOLKIT_PM@advlib_os2_joystick.o: $(srcdir)/src/os2/joystick.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_PM@      $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/os2/joystick.cpp
+
+@COND_TOOLKIT_PM@advlib_os2_sound.o: $(srcdir)/src/os2/sound.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_PM@      $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/os2/sound.cpp
  
  
-@COND_TOOLKIT_MSW_WXUNIV_0@advlib_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_MSW_WXUNIV_0@advlib_msw_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_MSW_WXUNIV_0@    $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/bmpcbox.cpp
  
  @COND_TOOLKIT_MSW_WXUNIV_0@    $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/bmpcbox.cpp
  
-@COND_TOOLKIT_WINCE_WXUNIV_0@advlib_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_WINCE_WXUNIV_0@advlib_msw_bmpcbox.o: $(srcdir)/src/msw/bmpcbox.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_WINCE_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/bmpcbox.cpp
  
  @COND_TOOLKIT_WINCE_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/bmpcbox.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@advlib_calctrl.o: $(srcdir)/src/gtk/calctrl.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/calctrl.cpp
-
-@COND_TOOLKIT_MSW_WXUNIV_0@advlib_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_MSW_WXUNIV_0@advlib_msw_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_MSW_WXUNIV_0@    $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
  
  @COND_TOOLKIT_MSW_WXUNIV_0@    $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
  
-@COND_TOOLKIT_WINCE_WXUNIV_0@advlib_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_WINCE_WXUNIV_0@advlib_msw_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_WINCE_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
  
  @COND_TOOLKIT_WINCE_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
  
+@COND_TOOLKIT_MSW_WXUNIV_0@advlib_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_MSW_WXUNIV_0@    $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
+
+@COND_TOOLKIT_WINCE_WXUNIV_0@advlib_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_WINCE_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
+
  @COND_TOOLKIT_MSW_WXUNIV_0@advlib_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_MSW_WXUNIV_0@    $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp
  
  @COND_TOOLKIT_MSW_WXUNIV_0@advlib_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_MSW_WXUNIV_0@    $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp
  
@@ -31674,12 +36137,24 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_WINCE_WXUNIV_0@advlib_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_WINCE_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp
  
  @COND_TOOLKIT_WINCE_WXUNIV_0@advlib_datectrl.o: $(srcdir)/src/msw/datectrl.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_WINCE_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp
  
+@COND_TOOLKIT_MSW_WXUNIV_0@advlib_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_MSW_WXUNIV_0@    $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp
+
+@COND_TOOLKIT_WINCE_WXUNIV_0@advlib_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_WINCE_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp
+
  mediadll_version_rc.o: $(srcdir)/src/msw/version.rc $(MEDIADLL_ODEP)
  mediadll_version_rc.o: $(srcdir)/src/msw/version.rc $(MEDIADLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_54)  $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_55) $(__INC_REGEX_p_53) $(__INC_EXPAT_p_53) --define WXUSINGDLL --define WXMAKINGDLL_MEDIA
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66)  $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_MEDIA
  
  mediadll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIADLL_ODEP)
         $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp
  
  
  mediadll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIADLL_ODEP)
         $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp
  
+mediadll_carbon_mediactrl.o: $(srcdir)/src/osx/carbon/mediactrl.cpp $(MEDIADLL_ODEP)
+       $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/osx/carbon/mediactrl.cpp
+
+mediadll_cocoa_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MEDIADLL_ODEP)
+       $(CXXC) -c -o $@ $(MEDIADLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/mediactrl.mm
+
  @COND_TOOLKIT_MSW@mediadll_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MEDIADLL_ODEP)
  @COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp
  
  @COND_TOOLKIT_MSW@mediadll_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MEDIADLL_ODEP)
  @COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp
  
@@ -31698,30 +36173,24 @@ mediadll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIADLL_ODEP)
  @COND_TOOLKIT_WINCE@mediadll_mediactrl_qt.o: $(srcdir)/src/msw/mediactrl_qt.cpp $(MEDIADLL_ODEP)
  @COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_qt.cpp
  
  @COND_TOOLKIT_WINCE@mediadll_mediactrl_qt.o: $(srcdir)/src/msw/mediactrl_qt.cpp $(MEDIADLL_ODEP)
  @COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_qt.cpp
  
-@COND_TOOLKIT_MSW@mediadll_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MEDIADLL_ODEP)
-@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
-
-@COND_TOOLKIT_WINCE@mediadll_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MEDIADLL_ODEP)
-@COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
-
-@COND_TOOLKIT_OSX_CARBON@mediadll_mediactrl.o: $(srcdir)/src/osx/carbon/mediactrl.cpp $(MEDIADLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/osx/carbon/mediactrl.cpp
-
-@COND_TOOLKIT_COCOA@mediadll_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MEDIADLL_ODEP)
-@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/cocoa/mediactrl.mm
-
-@COND_TOOLKIT_MOTIF@mediadll_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIADLL_ODEP)
+@COND_TOOLKIT_MOTIF@mediadll_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIADLL_ODEP)
  @COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
  
  @COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
  
-@COND_TOOLKIT_GTK@mediadll_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIADLL_ODEP)
+@COND_TOOLKIT_GTK@mediadll_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIADLL_ODEP)
  @COND_TOOLKIT_GTK@     $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
  
  @COND_TOOLKIT_GTK@     $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
  
-@COND_TOOLKIT_X11@mediadll_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIADLL_ODEP)
+@COND_TOOLKIT_X11@mediadll_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIADLL_ODEP)
  @COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
  
  medialib_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIALIB_ODEP)
         $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp
  
  @COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
  
  medialib_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIALIB_ODEP)
         $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp
  
+medialib_carbon_mediactrl.o: $(srcdir)/src/osx/carbon/mediactrl.cpp $(MEDIALIB_ODEP)
+       $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/osx/carbon/mediactrl.cpp
+
+medialib_cocoa_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MEDIALIB_ODEP)
+       $(CXXC) -c -o $@ $(MEDIALIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/mediactrl.mm
+
  @COND_TOOLKIT_MSW@medialib_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MEDIALIB_ODEP)
  @COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp
  
  @COND_TOOLKIT_MSW@medialib_mediactrl_am.o: $(srcdir)/src/msw/mediactrl_am.cpp $(MEDIALIB_ODEP)
  @COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_am.cpp
  
@@ -31740,29 +36209,17 @@ medialib_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIALIB_ODEP)
  @COND_TOOLKIT_WINCE@medialib_mediactrl_qt.o: $(srcdir)/src/msw/mediactrl_qt.cpp $(MEDIALIB_ODEP)
  @COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_qt.cpp
  
  @COND_TOOLKIT_WINCE@medialib_mediactrl_qt.o: $(srcdir)/src/msw/mediactrl_qt.cpp $(MEDIALIB_ODEP)
  @COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_qt.cpp
  
-@COND_TOOLKIT_MSW@medialib_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MEDIALIB_ODEP)
-@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
-
-@COND_TOOLKIT_WINCE@medialib_activex.o: $(srcdir)/src/msw/ole/activex.cpp $(MEDIALIB_ODEP)
-@COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/msw/ole/activex.cpp
-
-@COND_TOOLKIT_OSX_CARBON@medialib_mediactrl.o: $(srcdir)/src/osx/carbon/mediactrl.cpp $(MEDIALIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/osx/carbon/mediactrl.cpp
-
-@COND_TOOLKIT_COCOA@medialib_mediactrl.o: $(srcdir)/src/cocoa/mediactrl.mm $(MEDIALIB_ODEP)
-@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/cocoa/mediactrl.mm
-
-@COND_TOOLKIT_MOTIF@medialib_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIALIB_ODEP)
+@COND_TOOLKIT_MOTIF@medialib_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIALIB_ODEP)
  @COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
  
  @COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
  
-@COND_TOOLKIT_GTK@medialib_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIALIB_ODEP)
+@COND_TOOLKIT_GTK@medialib_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIALIB_ODEP)
  @COND_TOOLKIT_GTK@     $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
  
  @COND_TOOLKIT_GTK@     $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
  
-@COND_TOOLKIT_X11@medialib_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIALIB_ODEP)
+@COND_TOOLKIT_X11@medialib_unix_mediactrl.o: $(srcdir)/src/unix/mediactrl.cpp $(MEDIALIB_ODEP)
  @COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
  
  htmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(HTMLDLL_ODEP)
  @COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
  
  htmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(HTMLDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_54)  $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_55) $(__INC_REGEX_p_53) $(__INC_EXPAT_p_53) --define WXUSINGDLL --define WXMAKINGDLL_HTML
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66)  $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_HTML
  
  htmldll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(HTMLDLL_ODEP)
         $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/msw/helpbest.cpp
  
  htmldll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp $(HTMLDLL_ODEP)
         $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/msw/helpbest.cpp
@@ -31824,12 +36281,18 @@ htmldll_m_list.o: $(srcdir)/src/html/m_list.cpp $(HTMLDLL_ODEP)
  htmldll_m_pre.o: $(srcdir)/src/html/m_pre.cpp $(HTMLDLL_ODEP)
         $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/html/m_pre.cpp
  
  htmldll_m_pre.o: $(srcdir)/src/html/m_pre.cpp $(HTMLDLL_ODEP)
         $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/html/m_pre.cpp
  
+htmldll_m_span.o: $(srcdir)/src/html/m_span.cpp $(HTMLDLL_ODEP)
+       $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/html/m_span.cpp
+
  htmldll_m_style.o: $(srcdir)/src/html/m_style.cpp $(HTMLDLL_ODEP)
         $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/html/m_style.cpp
  
  htmldll_m_tables.o: $(srcdir)/src/html/m_tables.cpp $(HTMLDLL_ODEP)
         $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/html/m_tables.cpp
  
  htmldll_m_style.o: $(srcdir)/src/html/m_style.cpp $(HTMLDLL_ODEP)
         $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/html/m_style.cpp
  
  htmldll_m_tables.o: $(srcdir)/src/html/m_tables.cpp $(HTMLDLL_ODEP)
         $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/html/m_tables.cpp
  
+htmldll_styleparams.o: $(srcdir)/src/html/styleparams.cpp $(HTMLDLL_ODEP)
+       $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/html/styleparams.cpp
+
  htmldll_winpars.o: $(srcdir)/src/html/winpars.cpp $(HTMLDLL_ODEP)
         $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/html/winpars.cpp
  
  htmldll_winpars.o: $(srcdir)/src/html/winpars.cpp $(HTMLDLL_ODEP)
         $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/html/winpars.cpp
  
@@ -31902,12 +36365,18 @@ htmllib_m_list.o: $(srcdir)/src/html/m_list.cpp $(HTMLLIB_ODEP)
  htmllib_m_pre.o: $(srcdir)/src/html/m_pre.cpp $(HTMLLIB_ODEP)
         $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/m_pre.cpp
  
  htmllib_m_pre.o: $(srcdir)/src/html/m_pre.cpp $(HTMLLIB_ODEP)
         $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/m_pre.cpp
  
+htmllib_m_span.o: $(srcdir)/src/html/m_span.cpp $(HTMLLIB_ODEP)
+       $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/m_span.cpp
+
  htmllib_m_style.o: $(srcdir)/src/html/m_style.cpp $(HTMLLIB_ODEP)
         $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/m_style.cpp
  
  htmllib_m_tables.o: $(srcdir)/src/html/m_tables.cpp $(HTMLLIB_ODEP)
         $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/m_tables.cpp
  
  htmllib_m_style.o: $(srcdir)/src/html/m_style.cpp $(HTMLLIB_ODEP)
         $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/m_style.cpp
  
  htmllib_m_tables.o: $(srcdir)/src/html/m_tables.cpp $(HTMLLIB_ODEP)
         $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/m_tables.cpp
  
+htmllib_styleparams.o: $(srcdir)/src/html/styleparams.cpp $(HTMLLIB_ODEP)
+       $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/styleparams.cpp
+
  htmllib_winpars.o: $(srcdir)/src/html/winpars.cpp $(HTMLLIB_ODEP)
         $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/winpars.cpp
  
  htmllib_winpars.o: $(srcdir)/src/html/winpars.cpp $(HTMLLIB_ODEP)
         $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/winpars.cpp
  
@@ -31920,8 +36389,41 @@ htmllib_htmllbox.o: $(srcdir)/src/generic/htmllbox.cpp $(HTMLLIB_ODEP)
  @COND_PLATFORM_MACOSX_1@htmllib_chm.o: $(srcdir)/src/html/chm.cpp $(HTMLLIB_ODEP)
  @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp
  
  @COND_PLATFORM_MACOSX_1@htmllib_chm.o: $(srcdir)/src/html/chm.cpp $(HTMLLIB_ODEP)
  @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp
  
+webviewdll_version_rc.o: $(srcdir)/src/msw/version.rc $(WEBVIEWDLL_ODEP)
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66)  $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_WEBVIEW
+
+webviewdll_webview_ie.o: $(srcdir)/src/msw/webview_ie.cpp $(WEBVIEWDLL_ODEP)
+       $(CXXC) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(srcdir)/src/msw/webview_ie.cpp
+
+webviewdll_gtk_webview_webkit.o: $(srcdir)/src/gtk/webview_webkit.cpp $(WEBVIEWDLL_ODEP)
+       $(CXXC) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit.cpp
+
+webviewdll_osx_webview_webkit.o: $(srcdir)/src/osx/webview_webkit.mm $(WEBVIEWDLL_ODEP)
+       $(CXXC) -c -o $@ $(WEBVIEWDLL_OBJCXXFLAGS) $(srcdir)/src/osx/webview_webkit.mm
+
+webviewdll_webview.o: $(srcdir)/src/common/webview.cpp $(WEBVIEWDLL_ODEP)
+       $(CXXC) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(srcdir)/src/common/webview.cpp
+
+webviewdll_webviewarchivehandler.o: $(srcdir)/src/common/webviewarchivehandler.cpp $(WEBVIEWDLL_ODEP)
+       $(CXXC) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(srcdir)/src/common/webviewarchivehandler.cpp
+
+webviewlib_webview_ie.o: $(srcdir)/src/msw/webview_ie.cpp $(WEBVIEWLIB_ODEP)
+       $(CXXC) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(srcdir)/src/msw/webview_ie.cpp
+
+webviewlib_gtk_webview_webkit.o: $(srcdir)/src/gtk/webview_webkit.cpp $(WEBVIEWLIB_ODEP)
+       $(CXXC) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(srcdir)/src/gtk/webview_webkit.cpp
+
+webviewlib_osx_webview_webkit.o: $(srcdir)/src/osx/webview_webkit.mm $(WEBVIEWLIB_ODEP)
+       $(CXXC) -c -o $@ $(WEBVIEWLIB_OBJCXXFLAGS) $(srcdir)/src/osx/webview_webkit.mm
+
+webviewlib_webview.o: $(srcdir)/src/common/webview.cpp $(WEBVIEWLIB_ODEP)
+       $(CXXC) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(srcdir)/src/common/webview.cpp
+
+webviewlib_webviewarchivehandler.o: $(srcdir)/src/common/webviewarchivehandler.cpp $(WEBVIEWLIB_ODEP)
+       $(CXXC) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(srcdir)/src/common/webviewarchivehandler.cpp
+
  qadll_version_rc.o: $(srcdir)/src/msw/version.rc $(QADLL_ODEP)
  qadll_version_rc.o: $(srcdir)/src/msw/version.rc $(QADLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_54)  $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_55) $(__INC_REGEX_p_53) $(__INC_EXPAT_p_53) --define WXUSINGDLL --define WXMAKINGDLL_QA
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66)  $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_QA
  
  qadll_debugrpt.o: $(srcdir)/src/common/debugrpt.cpp $(QADLL_ODEP)
         $(CXXC) -c -o $@ $(QADLL_CXXFLAGS) $(srcdir)/src/common/debugrpt.cpp
  
  qadll_debugrpt.o: $(srcdir)/src/common/debugrpt.cpp $(QADLL_ODEP)
         $(CXXC) -c -o $@ $(QADLL_CXXFLAGS) $(srcdir)/src/common/debugrpt.cpp
@@ -31936,7 +36438,7 @@ qalib_dbgrptg.o: $(srcdir)/src/generic/dbgrptg.cpp $(QALIB_ODEP)
         $(CXXC) -c -o $@ $(QALIB_CXXFLAGS) $(srcdir)/src/generic/dbgrptg.cpp
  
  xmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(XMLDLL_ODEP)
         $(CXXC) -c -o $@ $(QALIB_CXXFLAGS) $(srcdir)/src/generic/dbgrptg.cpp
  
  xmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(XMLDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_54)  $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_55) $(__INC_REGEX_p_53) $(__INC_EXPAT_p_53) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_XML
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66)  $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_XML
  
  xmldll_xml.o: $(srcdir)/src/xml/xml.cpp $(XMLDLL_ODEP)
         $(CXXC) -c -o $@ $(XMLDLL_CXXFLAGS) $(srcdir)/src/xml/xml.cpp
  
  xmldll_xml.o: $(srcdir)/src/xml/xml.cpp $(XMLDLL_ODEP)
         $(CXXC) -c -o $@ $(XMLDLL_CXXFLAGS) $(srcdir)/src/xml/xml.cpp
@@ -31951,11 +36453,14 @@ xmllib_xtixml.o: $(srcdir)/src/common/xtixml.cpp $(XMLLIB_ODEP)
         $(CXXC) -c -o $@ $(XMLLIB_CXXFLAGS) $(srcdir)/src/common/xtixml.cpp
  
  xrcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XMLLIB_CXXFLAGS) $(srcdir)/src/common/xtixml.cpp
  
  xrcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(XRCDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_54)  $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_55) $(__INC_REGEX_p_53) $(__INC_EXPAT_p_53) --define WXUSINGDLL --define WXMAKINGDLL_XRC
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66)  $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_XRC
  
  xrcdll_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp
  
  
  xrcdll_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp
  
+xrcdll_xh_bannerwindow.o: $(srcdir)/src/xrc/xh_bannerwindow.cpp $(XRCDLL_ODEP)
+       $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_bannerwindow.cpp
+
  xrcdll_xh_bmp.o: $(srcdir)/src/xrc/xh_bmp.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_bmp.cpp
  
  xrcdll_xh_bmp.o: $(srcdir)/src/xrc/xh_bmp.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_bmp.cpp
  
@@ -31986,12 +36491,18 @@ xrcdll_xh_choicbk.o: $(srcdir)/src/xrc/xh_choicbk.cpp $(XRCDLL_ODEP)
  xrcdll_xh_clrpicker.o: $(srcdir)/src/xrc/xh_clrpicker.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_clrpicker.cpp
  
  xrcdll_xh_clrpicker.o: $(srcdir)/src/xrc/xh_clrpicker.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_clrpicker.cpp
  
+xrcdll_xh_cmdlinkbn.o: $(srcdir)/src/xrc/xh_cmdlinkbn.cpp $(XRCDLL_ODEP)
+       $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_cmdlinkbn.cpp
+
  xrcdll_xh_collpane.o: $(srcdir)/src/xrc/xh_collpane.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_collpane.cpp
  
  xrcdll_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp
  
  xrcdll_xh_collpane.o: $(srcdir)/src/xrc/xh_collpane.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_collpane.cpp
  
  xrcdll_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp
  
+xrcdll_xh_comboctrl.o: $(srcdir)/src/xrc/xh_comboctrl.cpp $(XRCDLL_ODEP)
+       $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_comboctrl.cpp
+
  xrcdll_xh_datectrl.o: $(srcdir)/src/xrc/xh_datectrl.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_datectrl.cpp
  
  xrcdll_xh_datectrl.o: $(srcdir)/src/xrc/xh_datectrl.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_datectrl.cpp
  
@@ -32001,11 +36512,11 @@ xrcdll_xh_dirpicker.o: $(srcdir)/src/xrc/xh_dirpicker.cpp $(XRCDLL_ODEP)
  xrcdll_xh_dlg.o: $(srcdir)/src/xrc/xh_dlg.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_dlg.cpp
  
  xrcdll_xh_dlg.o: $(srcdir)/src/xrc/xh_dlg.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_dlg.cpp
  
-xrcdll_xh_frame.o: $(srcdir)/src/xrc/xh_frame.cpp $(XRCDLL_ODEP)
-       $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_frame.cpp
+xrcdll_xh_editlbox.o: $(srcdir)/src/xrc/xh_editlbox.cpp $(XRCDLL_ODEP)
+       $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_editlbox.cpp
  
  
-xrcdll_xh_mdi.o: $(srcdir)/src/xrc/xh_mdi.cpp $(XRCDLL_ODEP)
-       $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_mdi.cpp
+xrcdll_xh_filectrl.o: $(srcdir)/src/xrc/xh_filectrl.cpp $(XRCDLL_ODEP)
+       $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_filectrl.cpp
  
  xrcdll_xh_filepicker.o: $(srcdir)/src/xrc/xh_filepicker.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_filepicker.cpp
  
  xrcdll_xh_filepicker.o: $(srcdir)/src/xrc/xh_filepicker.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_filepicker.cpp
@@ -32013,6 +36524,9 @@ xrcdll_xh_filepicker.o: $(srcdir)/src/xrc/xh_filepicker.cpp $(XRCDLL_ODEP)
  xrcdll_xh_fontpicker.o: $(srcdir)/src/xrc/xh_fontpicker.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_fontpicker.cpp
  
  xrcdll_xh_fontpicker.o: $(srcdir)/src/xrc/xh_fontpicker.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_fontpicker.cpp
  
+xrcdll_xh_frame.o: $(srcdir)/src/xrc/xh_frame.cpp $(XRCDLL_ODEP)
+       $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_frame.cpp
+
  xrcdll_xh_gauge.o: $(srcdir)/src/xrc/xh_gauge.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_gauge.cpp
  
  xrcdll_xh_gauge.o: $(srcdir)/src/xrc/xh_gauge.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_gauge.cpp
  
@@ -32037,6 +36551,9 @@ xrcdll_xh_listbk.o: $(srcdir)/src/xrc/xh_listbk.cpp $(XRCDLL_ODEP)
  xrcdll_xh_listc.o: $(srcdir)/src/xrc/xh_listc.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_listc.cpp
  
  xrcdll_xh_listc.o: $(srcdir)/src/xrc/xh_listc.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_listc.cpp
  
+xrcdll_xh_mdi.o: $(srcdir)/src/xrc/xh_mdi.cpp $(XRCDLL_ODEP)
+       $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_mdi.cpp
+
  xrcdll_xh_menu.o: $(srcdir)/src/xrc/xh_menu.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_menu.cpp
  
  xrcdll_xh_menu.o: $(srcdir)/src/xrc/xh_menu.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_menu.cpp
  
@@ -32106,6 +36623,9 @@ xrcdll_xh_tglbtn.o: $(srcdir)/src/xrc/xh_tglbtn.cpp $(XRCDLL_ODEP)
  xrcdll_xh_toolb.o: $(srcdir)/src/xrc/xh_toolb.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_toolb.cpp
  
  xrcdll_xh_toolb.o: $(srcdir)/src/xrc/xh_toolb.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_toolb.cpp
  
+xrcdll_xh_toolbk.o: $(srcdir)/src/xrc/xh_toolbk.cpp $(XRCDLL_ODEP)
+       $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_toolbk.cpp
+
  xrcdll_xh_tree.o: $(srcdir)/src/xrc/xh_tree.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_tree.cpp
  
  xrcdll_xh_tree.o: $(srcdir)/src/xrc/xh_tree.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_tree.cpp
  
@@ -32130,6 +36650,9 @@ xrcdll_xmlrsall.o: $(srcdir)/src/xrc/xmlrsall.cpp $(XRCDLL_ODEP)
  xrclib_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp
  
  xrclib_xh_animatctrl.o: $(srcdir)/src/xrc/xh_animatctrl.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_animatctrl.cpp
  
+xrclib_xh_bannerwindow.o: $(srcdir)/src/xrc/xh_bannerwindow.cpp $(XRCLIB_ODEP)
+       $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_bannerwindow.cpp
+
  xrclib_xh_bmp.o: $(srcdir)/src/xrc/xh_bmp.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_bmp.cpp
  
  xrclib_xh_bmp.o: $(srcdir)/src/xrc/xh_bmp.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_bmp.cpp
  
@@ -32160,12 +36683,18 @@ xrclib_xh_choicbk.o: $(srcdir)/src/xrc/xh_choicbk.cpp $(XRCLIB_ODEP)
  xrclib_xh_clrpicker.o: $(srcdir)/src/xrc/xh_clrpicker.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_clrpicker.cpp
  
  xrclib_xh_clrpicker.o: $(srcdir)/src/xrc/xh_clrpicker.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_clrpicker.cpp
  
+xrclib_xh_cmdlinkbn.o: $(srcdir)/src/xrc/xh_cmdlinkbn.cpp $(XRCLIB_ODEP)
+       $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_cmdlinkbn.cpp
+
  xrclib_xh_collpane.o: $(srcdir)/src/xrc/xh_collpane.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_collpane.cpp
  
  xrclib_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp
  
  xrclib_xh_collpane.o: $(srcdir)/src/xrc/xh_collpane.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_collpane.cpp
  
  xrclib_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp
  
+xrclib_xh_comboctrl.o: $(srcdir)/src/xrc/xh_comboctrl.cpp $(XRCLIB_ODEP)
+       $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_comboctrl.cpp
+
  xrclib_xh_datectrl.o: $(srcdir)/src/xrc/xh_datectrl.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_datectrl.cpp
  
  xrclib_xh_datectrl.o: $(srcdir)/src/xrc/xh_datectrl.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_datectrl.cpp
  
@@ -32175,11 +36704,11 @@ xrclib_xh_dirpicker.o: $(srcdir)/src/xrc/xh_dirpicker.cpp $(XRCLIB_ODEP)
  xrclib_xh_dlg.o: $(srcdir)/src/xrc/xh_dlg.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_dlg.cpp
  
  xrclib_xh_dlg.o: $(srcdir)/src/xrc/xh_dlg.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_dlg.cpp
  
-xrclib_xh_frame.o: $(srcdir)/src/xrc/xh_frame.cpp $(XRCLIB_ODEP)
-       $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_frame.cpp
+xrclib_xh_editlbox.o: $(srcdir)/src/xrc/xh_editlbox.cpp $(XRCLIB_ODEP)
+       $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_editlbox.cpp
  
  
-xrclib_xh_mdi.o: $(srcdir)/src/xrc/xh_mdi.cpp $(XRCLIB_ODEP)
-       $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_mdi.cpp
+xrclib_xh_filectrl.o: $(srcdir)/src/xrc/xh_filectrl.cpp $(XRCLIB_ODEP)
+       $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_filectrl.cpp
  
  xrclib_xh_filepicker.o: $(srcdir)/src/xrc/xh_filepicker.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_filepicker.cpp
  
  xrclib_xh_filepicker.o: $(srcdir)/src/xrc/xh_filepicker.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_filepicker.cpp
@@ -32187,6 +36716,9 @@ xrclib_xh_filepicker.o: $(srcdir)/src/xrc/xh_filepicker.cpp $(XRCLIB_ODEP)
  xrclib_xh_fontpicker.o: $(srcdir)/src/xrc/xh_fontpicker.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_fontpicker.cpp
  
  xrclib_xh_fontpicker.o: $(srcdir)/src/xrc/xh_fontpicker.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_fontpicker.cpp
  
+xrclib_xh_frame.o: $(srcdir)/src/xrc/xh_frame.cpp $(XRCLIB_ODEP)
+       $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_frame.cpp
+
  xrclib_xh_gauge.o: $(srcdir)/src/xrc/xh_gauge.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_gauge.cpp
  
  xrclib_xh_gauge.o: $(srcdir)/src/xrc/xh_gauge.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_gauge.cpp
  
@@ -32211,6 +36743,9 @@ xrclib_xh_listbk.o: $(srcdir)/src/xrc/xh_listbk.cpp $(XRCLIB_ODEP)
  xrclib_xh_listc.o: $(srcdir)/src/xrc/xh_listc.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_listc.cpp
  
  xrclib_xh_listc.o: $(srcdir)/src/xrc/xh_listc.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_listc.cpp
  
+xrclib_xh_mdi.o: $(srcdir)/src/xrc/xh_mdi.cpp $(XRCLIB_ODEP)
+       $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_mdi.cpp
+
  xrclib_xh_menu.o: $(srcdir)/src/xrc/xh_menu.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_menu.cpp
  
  xrclib_xh_menu.o: $(srcdir)/src/xrc/xh_menu.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_menu.cpp
  
@@ -32280,6 +36815,9 @@ xrclib_xh_tglbtn.o: $(srcdir)/src/xrc/xh_tglbtn.cpp $(XRCLIB_ODEP)
  xrclib_xh_toolb.o: $(srcdir)/src/xrc/xh_toolb.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_toolb.cpp
  
  xrclib_xh_toolb.o: $(srcdir)/src/xrc/xh_toolb.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_toolb.cpp
  
+xrclib_xh_toolbk.o: $(srcdir)/src/xrc/xh_toolbk.cpp $(XRCLIB_ODEP)
+       $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_toolbk.cpp
+
  xrclib_xh_tree.o: $(srcdir)/src/xrc/xh_tree.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_tree.cpp
  
  xrclib_xh_tree.o: $(srcdir)/src/xrc/xh_tree.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_tree.cpp
  
@@ -32302,7 +36840,7 @@ xrclib_xmlrsall.o: $(srcdir)/src/xrc/xmlrsall.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xmlrsall.cpp
  
  auidll_version_rc.o: $(srcdir)/src/msw/version.rc $(AUIDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xmlrsall.cpp
  
  auidll_version_rc.o: $(srcdir)/src/msw/version.rc $(AUIDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_54)  $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_55) $(__INC_REGEX_p_53) $(__INC_EXPAT_p_53) --define WXUSINGDLL --define WXMAKINGDLL_AUI
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66)  $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_AUI
  
  auidll_framemanager.o: $(srcdir)/src/aui/framemanager.cpp $(AUIDLL_ODEP)
         $(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/aui/framemanager.cpp
  
  auidll_framemanager.o: $(srcdir)/src/aui/framemanager.cpp $(AUIDLL_ODEP)
         $(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/aui/framemanager.cpp
@@ -32340,65 +36878,185 @@ auilib_auibar.o: $(srcdir)/src/aui/auibar.cpp $(AUILIB_ODEP)
  auilib_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(AUILIB_ODEP)
         $(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/tabmdi.cpp
  
  auilib_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(AUILIB_ODEP)
         $(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/tabmdi.cpp
  
-richtextdll_version_rc.o: $(srcdir)/src/msw/version.rc $(RICHTEXTDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_54)  $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_55) $(__INC_REGEX_p_53) $(__INC_EXPAT_p_53) --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT
+ribbondll_version_rc.o: $(srcdir)/src/msw/version.rc $(RIBBONDLL_ODEP)
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66)  $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_RIBBON
  
  
-richtextdll_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(RICHTEXTDLL_ODEP)
-       $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp
+ribbondll_art_internal.o: $(srcdir)/src/ribbon/art_internal.cpp $(RIBBONDLL_ODEP)
+       $(CXXC) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(srcdir)/src/ribbon/art_internal.cpp
+
+ribbondll_art_msw.o: $(srcdir)/src/ribbon/art_msw.cpp $(RIBBONDLL_ODEP)
+       $(CXXC) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(srcdir)/src/ribbon/art_msw.cpp
+
+ribbondll_art_aui.o: $(srcdir)/src/ribbon/art_aui.cpp $(RIBBONDLL_ODEP)
+       $(CXXC) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(srcdir)/src/ribbon/art_aui.cpp
+
+ribbondll_bar.o: $(srcdir)/src/ribbon/bar.cpp $(RIBBONDLL_ODEP)
+       $(CXXC) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(srcdir)/src/ribbon/bar.cpp
+
+ribbondll_buttonbar.o: $(srcdir)/src/ribbon/buttonbar.cpp $(RIBBONDLL_ODEP)
+       $(CXXC) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(srcdir)/src/ribbon/buttonbar.cpp
+
+ribbondll_control.o: $(srcdir)/src/ribbon/control.cpp $(RIBBONDLL_ODEP)
+       $(CXXC) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(srcdir)/src/ribbon/control.cpp
+
+ribbondll_gallery.o: $(srcdir)/src/ribbon/gallery.cpp $(RIBBONDLL_ODEP)
+       $(CXXC) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(srcdir)/src/ribbon/gallery.cpp
+
+ribbondll_page.o: $(srcdir)/src/ribbon/page.cpp $(RIBBONDLL_ODEP)
+       $(CXXC) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(srcdir)/src/ribbon/page.cpp
+
+ribbondll_panel.o: $(srcdir)/src/ribbon/panel.cpp $(RIBBONDLL_ODEP)
+       $(CXXC) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(srcdir)/src/ribbon/panel.cpp
+
+ribbondll_toolbar.o: $(srcdir)/src/ribbon/toolbar.cpp $(RIBBONDLL_ODEP)
+       $(CXXC) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(srcdir)/src/ribbon/toolbar.cpp
+
+ribbonlib_art_internal.o: $(srcdir)/src/ribbon/art_internal.cpp $(RIBBONLIB_ODEP)
+       $(CXXC) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(srcdir)/src/ribbon/art_internal.cpp
+
+ribbonlib_art_msw.o: $(srcdir)/src/ribbon/art_msw.cpp $(RIBBONLIB_ODEP)
+       $(CXXC) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(srcdir)/src/ribbon/art_msw.cpp
+
+ribbonlib_art_aui.o: $(srcdir)/src/ribbon/art_aui.cpp $(RIBBONLIB_ODEP)
+       $(CXXC) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(srcdir)/src/ribbon/art_aui.cpp
+
+ribbonlib_bar.o: $(srcdir)/src/ribbon/bar.cpp $(RIBBONLIB_ODEP)
+       $(CXXC) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(srcdir)/src/ribbon/bar.cpp
+
+ribbonlib_buttonbar.o: $(srcdir)/src/ribbon/buttonbar.cpp $(RIBBONLIB_ODEP)
+       $(CXXC) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(srcdir)/src/ribbon/buttonbar.cpp
+
+ribbonlib_control.o: $(srcdir)/src/ribbon/control.cpp $(RIBBONLIB_ODEP)
+       $(CXXC) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(srcdir)/src/ribbon/control.cpp
+
+ribbonlib_gallery.o: $(srcdir)/src/ribbon/gallery.cpp $(RIBBONLIB_ODEP)
+       $(CXXC) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(srcdir)/src/ribbon/gallery.cpp
+
+ribbonlib_page.o: $(srcdir)/src/ribbon/page.cpp $(RIBBONLIB_ODEP)
+       $(CXXC) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(srcdir)/src/ribbon/page.cpp
+
+ribbonlib_panel.o: $(srcdir)/src/ribbon/panel.cpp $(RIBBONLIB_ODEP)
+       $(CXXC) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(srcdir)/src/ribbon/panel.cpp
+
+ribbonlib_toolbar.o: $(srcdir)/src/ribbon/toolbar.cpp $(RIBBONLIB_ODEP)
+       $(CXXC) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(srcdir)/src/ribbon/toolbar.cpp
+
+propgriddll_version_rc.o: $(srcdir)/src/msw/version.rc $(PROPGRIDDLL_ODEP)
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66)  $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_PROPGRID
+
+propgriddll_advprops.o: $(srcdir)/src/propgrid/advprops.cpp $(PROPGRIDDLL_ODEP)
+       $(CXXC) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(srcdir)/src/propgrid/advprops.cpp
+
+propgriddll_editors.o: $(srcdir)/src/propgrid/editors.cpp $(PROPGRIDDLL_ODEP)
+       $(CXXC) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(srcdir)/src/propgrid/editors.cpp
+
+propgriddll_manager.o: $(srcdir)/src/propgrid/manager.cpp $(PROPGRIDDLL_ODEP)
+       $(CXXC) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(srcdir)/src/propgrid/manager.cpp
+
+propgriddll_property.o: $(srcdir)/src/propgrid/property.cpp $(PROPGRIDDLL_ODEP)
+       $(CXXC) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(srcdir)/src/propgrid/property.cpp
+
+propgriddll_propgrid.o: $(srcdir)/src/propgrid/propgrid.cpp $(PROPGRIDDLL_ODEP)
+       $(CXXC) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(srcdir)/src/propgrid/propgrid.cpp
+
+propgriddll_propgridiface.o: $(srcdir)/src/propgrid/propgridiface.cpp $(PROPGRIDDLL_ODEP)
+       $(CXXC) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(srcdir)/src/propgrid/propgridiface.cpp
+
+propgriddll_propgridpagestate.o: $(srcdir)/src/propgrid/propgridpagestate.cpp $(PROPGRIDDLL_ODEP)
+       $(CXXC) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(srcdir)/src/propgrid/propgridpagestate.cpp
+
+propgriddll_props.o: $(srcdir)/src/propgrid/props.cpp $(PROPGRIDDLL_ODEP)
+       $(CXXC) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(srcdir)/src/propgrid/props.cpp
+
+propgridlib_advprops.o: $(srcdir)/src/propgrid/advprops.cpp $(PROPGRIDLIB_ODEP)
+       $(CXXC) -c -o $@ $(PROPGRIDLIB_CXXFLAGS) $(srcdir)/src/propgrid/advprops.cpp
+
+propgridlib_editors.o: $(srcdir)/src/propgrid/editors.cpp $(PROPGRIDLIB_ODEP)
+       $(CXXC) -c -o $@ $(PROPGRIDLIB_CXXFLAGS) $(srcdir)/src/propgrid/editors.cpp
+
+propgridlib_manager.o: $(srcdir)/src/propgrid/manager.cpp $(PROPGRIDLIB_ODEP)
+       $(CXXC) -c -o $@ $(PROPGRIDLIB_CXXFLAGS) $(srcdir)/src/propgrid/manager.cpp
+
+propgridlib_property.o: $(srcdir)/src/propgrid/property.cpp $(PROPGRIDLIB_ODEP)
+       $(CXXC) -c -o $@ $(PROPGRIDLIB_CXXFLAGS) $(srcdir)/src/propgrid/property.cpp
+
+propgridlib_propgrid.o: $(srcdir)/src/propgrid/propgrid.cpp $(PROPGRIDLIB_ODEP)
+       $(CXXC) -c -o $@ $(PROPGRIDLIB_CXXFLAGS) $(srcdir)/src/propgrid/propgrid.cpp
+
+propgridlib_propgridiface.o: $(srcdir)/src/propgrid/propgridiface.cpp $(PROPGRIDLIB_ODEP)
+       $(CXXC) -c -o $@ $(PROPGRIDLIB_CXXFLAGS) $(srcdir)/src/propgrid/propgridiface.cpp
+
+propgridlib_propgridpagestate.o: $(srcdir)/src/propgrid/propgridpagestate.cpp $(PROPGRIDLIB_ODEP)
+       $(CXXC) -c -o $@ $(PROPGRIDLIB_CXXFLAGS) $(srcdir)/src/propgrid/propgridpagestate.cpp
+
+propgridlib_props.o: $(srcdir)/src/propgrid/props.cpp $(PROPGRIDLIB_ODEP)
+       $(CXXC) -c -o $@ $(PROPGRIDLIB_CXXFLAGS) $(srcdir)/src/propgrid/props.cpp
+
+richtextdll_version_rc.o: $(srcdir)/src/msw/version.rc $(RICHTEXTDLL_ODEP)
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66)  $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT
  
  richtextdll_richtextbuffer.o: $(srcdir)/src/richtext/richtextbuffer.cpp $(RICHTEXTDLL_ODEP)
         $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextbuffer.cpp
  
  
  richtextdll_richtextbuffer.o: $(srcdir)/src/richtext/richtextbuffer.cpp $(RICHTEXTDLL_ODEP)
         $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextbuffer.cpp
  
-richtextdll_richtextstyles.o: $(srcdir)/src/richtext/richtextstyles.cpp $(RICHTEXTDLL_ODEP)
-       $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextstyles.cpp
+richtextdll_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(RICHTEXTDLL_ODEP)
+       $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp
  
  
-richtextdll_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(RICHTEXTDLL_ODEP)
-       $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp
+richtextdll_richtextformatdlg.o: $(srcdir)/src/richtext/richtextformatdlg.cpp $(RICHTEXTDLL_ODEP)
+       $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextformatdlg.cpp
  
  richtextdll_richtexthtml.o: $(srcdir)/src/richtext/richtexthtml.cpp $(RICHTEXTDLL_ODEP)
         $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtexthtml.cpp
  
  
  richtextdll_richtexthtml.o: $(srcdir)/src/richtext/richtexthtml.cpp $(RICHTEXTDLL_ODEP)
         $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtexthtml.cpp
  
-richtextdll_richtextformatdlg.o: $(srcdir)/src/richtext/richtextformatdlg.cpp $(RICHTEXTDLL_ODEP)
-       $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextformatdlg.cpp
+richtextdll_richtextimagedlg.o: $(srcdir)/src/richtext/richtextimagedlg.cpp $(RICHTEXTDLL_ODEP)
+       $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextimagedlg.cpp
  
  
-richtextdll_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(RICHTEXTDLL_ODEP)
-       $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextsymboldlg.cpp
+richtextdll_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(RICHTEXTDLL_ODEP)
+       $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp
  
  richtextdll_richtextstyledlg.o: $(srcdir)/src/richtext/richtextstyledlg.cpp $(RICHTEXTDLL_ODEP)
         $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextstyledlg.cpp
  
  
  richtextdll_richtextstyledlg.o: $(srcdir)/src/richtext/richtextstyledlg.cpp $(RICHTEXTDLL_ODEP)
         $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextstyledlg.cpp
  
-richtextdll_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(RICHTEXTDLL_ODEP)
-       $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp
+richtextdll_richtextstyles.o: $(srcdir)/src/richtext/richtextstyles.cpp $(RICHTEXTDLL_ODEP)
+       $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextstyles.cpp
  
  
-richtextlib_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(RICHTEXTLIB_ODEP)
-       $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp
+richtextdll_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(RICHTEXTDLL_ODEP)
+       $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextsymboldlg.cpp
+
+richtextdll_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(RICHTEXTDLL_ODEP)
+       $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp
  
  richtextlib_richtextbuffer.o: $(srcdir)/src/richtext/richtextbuffer.cpp $(RICHTEXTLIB_ODEP)
         $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextbuffer.cpp
  
  
  richtextlib_richtextbuffer.o: $(srcdir)/src/richtext/richtextbuffer.cpp $(RICHTEXTLIB_ODEP)
         $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextbuffer.cpp
  
-richtextlib_richtextstyles.o: $(srcdir)/src/richtext/richtextstyles.cpp $(RICHTEXTLIB_ODEP)
-       $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextstyles.cpp
+richtextlib_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(RICHTEXTLIB_ODEP)
+       $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp
  
  
-richtextlib_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(RICHTEXTLIB_ODEP)
-       $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp
+richtextlib_richtextformatdlg.o: $(srcdir)/src/richtext/richtextformatdlg.cpp $(RICHTEXTLIB_ODEP)
+       $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextformatdlg.cpp
  
  richtextlib_richtexthtml.o: $(srcdir)/src/richtext/richtexthtml.cpp $(RICHTEXTLIB_ODEP)
         $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtexthtml.cpp
  
  
  richtextlib_richtexthtml.o: $(srcdir)/src/richtext/richtexthtml.cpp $(RICHTEXTLIB_ODEP)
         $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtexthtml.cpp
  
-richtextlib_richtextformatdlg.o: $(srcdir)/src/richtext/richtextformatdlg.cpp $(RICHTEXTLIB_ODEP)
-       $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextformatdlg.cpp
+richtextlib_richtextimagedlg.o: $(srcdir)/src/richtext/richtextimagedlg.cpp $(RICHTEXTLIB_ODEP)
+       $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextimagedlg.cpp
  
  
-richtextlib_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(RICHTEXTLIB_ODEP)
-       $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextsymboldlg.cpp
+richtextlib_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(RICHTEXTLIB_ODEP)
+       $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp
  
  richtextlib_richtextstyledlg.o: $(srcdir)/src/richtext/richtextstyledlg.cpp $(RICHTEXTLIB_ODEP)
         $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextstyledlg.cpp
  
  
  richtextlib_richtextstyledlg.o: $(srcdir)/src/richtext/richtextstyledlg.cpp $(RICHTEXTLIB_ODEP)
         $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextstyledlg.cpp
  
-richtextlib_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(RICHTEXTLIB_ODEP)
-       $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp
+richtextlib_richtextstyles.o: $(srcdir)/src/richtext/richtextstyles.cpp $(RICHTEXTLIB_ODEP)
+       $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextstyles.cpp
+
+richtextlib_richtextsymboldlg.o: $(srcdir)/src/richtext/richtextsymboldlg.cpp $(RICHTEXTLIB_ODEP)
+       $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextsymboldlg.cpp
+
+richtextlib_richtextxml.o: $(srcdir)/src/richtext/richtextxml.cpp $(RICHTEXTLIB_ODEP)
+       $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextxml.cpp
  
  stcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(STCDLL_ODEP)
  
  stcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(STCDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_54)  $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_55) $(__INC_REGEX_p_53) $(__INC_EXPAT_p_53) --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define WXUSINGDLL --define WXMAKINGDLL_STC
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66)  $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --include-dir $(top_srcdir)/src/stc/scintilla/include --include-dir $(top_srcdir)/src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define WXUSINGDLL --define WXMAKINGDLL_STC
  
  stcdll_stc.o: $(srcdir)/src/stc/stc.cpp $(STCDLL_ODEP)
         $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/src/stc/stc.cpp
  
  stcdll_stc.o: $(srcdir)/src/stc/stc.cpp $(STCDLL_ODEP)
         $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/src/stc/stc.cpp
@@ -32419,40 +37077,40 @@ stclib_ScintillaWX.o: $(srcdir)/src/stc/ScintillaWX.cpp $(STCLIB_ODEP)
         $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/src/stc/ScintillaWX.cpp
  
  gldll_version_rc.o: $(srcdir)/src/msw/version.rc $(GLDLL_ODEP)
         $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/src/stc/ScintillaWX.cpp
  
  gldll_version_rc.o: $(srcdir)/src/msw/version.rc $(GLDLL_ODEP)
-       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_54)  $(__EXCEPTIONS_DEFINE_p_53) $(__RTTI_DEFINE_p_53) $(__THREAD_DEFINE_p_53)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_54) $(__INC_TIFF_p_54) $(__INC_JPEG_p_54) $(__INC_PNG_p_53) $(__INC_ZLIB_p_55) $(__INC_REGEX_p_53) $(__INC_EXPAT_p_53) --define WXUSINGDLL --define WXMAKINGDLL_GL
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66)  $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_GL
  
  gldll_glcmn.o: $(srcdir)/src/common/glcmn.cpp $(GLDLL_ODEP)
         $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/common/glcmn.cpp
  
  
  gldll_glcmn.o: $(srcdir)/src/common/glcmn.cpp $(GLDLL_ODEP)
         $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/common/glcmn.cpp
  
-gldll_glcanvas_osx.o: $(srcdir)/src/osx/glcanvas_osx.cpp $(GLDLL_ODEP)
-       $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/osx/glcanvas_osx.cpp
+gldll_carbon_glcanvas.o: $(srcdir)/src/osx/carbon/glcanvas.cpp $(GLDLL_ODEP)
+       $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/glcanvas.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON@gldll_glcanvas.o: $(srcdir)/src/osx/carbon/glcanvas.cpp $(GLDLL_ODEP)
-@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/glcanvas.cpp
+gldll_osx_cocoa_glcanvas.o: $(srcdir)/src/osx/cocoa/glcanvas.mm $(GLDLL_ODEP)
+       $(CXXC) -c -o $@ $(GLDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/glcanvas.mm
  
  
-@COND_TOOLKIT_COCOA@gldll_glcanvas.o: $(srcdir)/src/cocoa/glcanvas.mm $(GLDLL_ODEP)
-@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/cocoa/glcanvas.mm
+gldll_iphone_glcanvas.o: $(srcdir)/src/osx/iphone/glcanvas.mm $(GLDLL_ODEP)
+       $(CXXC) -c -o $@ $(GLDLL_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/glcanvas.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@gldll_glcanvas.o: $(srcdir)/src/gtk/glcanvas.cpp $(GLDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/gtk/glcanvas.cpp
+gldll_src_cocoa_glcanvas.o: $(srcdir)/src/cocoa/glcanvas.mm $(GLDLL_ODEP)
+       $(CXXC) -c -o $@ $(GLDLL_OBJCXXFLAGS) $(srcdir)/src/cocoa/glcanvas.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@gldll_glcanvas.o: $(srcdir)/src/gtk1/glcanvas.cpp $(GLDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/gtk1/glcanvas.cpp
+gldll_gtk_glcanvas.o: $(srcdir)/src/gtk/glcanvas.cpp $(GLDLL_ODEP)
+       $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/gtk/glcanvas.cpp
  
  
-@COND_TOOLKIT_MSW@gldll_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp $(GLDLL_ODEP)
-@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/msw/glcanvas.cpp
+gldll_gtk1_glcanvas.o: $(srcdir)/src/gtk1/glcanvas.cpp $(GLDLL_ODEP)
+       $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/gtk1/glcanvas.cpp
  
  
-@COND_TOOLKIT_WINCE@gldll_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp $(GLDLL_ODEP)
-@COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/msw/glcanvas.cpp
+gldll_os2_glcanvas.o: $(srcdir)/src/os2/glcanvas.cpp $(GLDLL_ODEP)
+       $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/os2/glcanvas.cpp
  
  
-@COND_TOOLKIT_MOTIF@gldll_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp $(GLDLL_ODEP)
-@COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/x11/glcanvas.cpp
+@COND_TOOLKIT_OSX_CARBON@gldll_glcanvas_osx.o: $(srcdir)/src/osx/glcanvas_osx.cpp $(GLDLL_ODEP)
+@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/osx/glcanvas_osx.cpp
  
  
-@COND_TOOLKIT_X11@gldll_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp $(GLDLL_ODEP)
-@COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/x11/glcanvas.cpp
+@COND_TOOLKIT_OSX_COCOA@gldll_glcanvas_osx.o: $(srcdir)/src/osx/glcanvas_osx.cpp $(GLDLL_ODEP)
+@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/osx/glcanvas_osx.cpp
  
  
-@COND_TOOLKIT_PM@gldll_glcanvas.o: $(srcdir)/src/os2/glcanvas.cpp $(GLDLL_ODEP)
-@COND_TOOLKIT_PM@      $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/os2/glcanvas.cpp
+@COND_TOOLKIT_OSX_IPHONE@gldll_glcanvas_osx.o: $(srcdir)/src/osx/glcanvas_osx.cpp $(GLDLL_ODEP)
+@COND_TOOLKIT_OSX_IPHONE@      $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/osx/glcanvas_osx.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@gldll_glx11.o: $(srcdir)/src/unix/glx11.cpp $(GLDLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/unix/glx11.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@gldll_glx11.o: $(srcdir)/src/unix/glx11.cpp $(GLDLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/unix/glx11.cpp
@@ -32466,38 +37124,50 @@ gldll_glcanvas_osx.o: $(srcdir)/src/osx/glcanvas_osx.cpp $(GLDLL_ODEP)
  @COND_TOOLKIT_X11@gldll_glx11.o: $(srcdir)/src/unix/glx11.cpp $(GLDLL_ODEP)
  @COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/unix/glx11.cpp
  
  @COND_TOOLKIT_X11@gldll_glx11.o: $(srcdir)/src/unix/glx11.cpp $(GLDLL_ODEP)
  @COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/unix/glx11.cpp
  
+@COND_TOOLKIT_MSW@gldll_msw_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp $(GLDLL_ODEP)
+@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/msw/glcanvas.cpp
+
+@COND_TOOLKIT_WINCE@gldll_msw_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp $(GLDLL_ODEP)
+@COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/msw/glcanvas.cpp
+
+@COND_TOOLKIT_MOTIF@gldll_x11_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp $(GLDLL_ODEP)
+@COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/x11/glcanvas.cpp
+
+@COND_TOOLKIT_X11@gldll_x11_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp $(GLDLL_ODEP)
+@COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/x11/glcanvas.cpp
+
  gllib_glcmn.o: $(srcdir)/src/common/glcmn.cpp $(GLLIB_ODEP)
         $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/common/glcmn.cpp
  
  gllib_glcmn.o: $(srcdir)/src/common/glcmn.cpp $(GLLIB_ODEP)
         $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/common/glcmn.cpp
  
-gllib_glcanvas_osx.o: $(srcdir)/src/osx/glcanvas_osx.cpp $(GLLIB_ODEP)
-       $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/osx/glcanvas_osx.cpp
+gllib_carbon_glcanvas.o: $(srcdir)/src/osx/carbon/glcanvas.cpp $(GLLIB_ODEP)
+       $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/glcanvas.cpp
  
  
-@COND_TOOLKIT_OSX_CARBON@gllib_glcanvas.o: $(srcdir)/src/osx/carbon/glcanvas.cpp $(GLLIB_ODEP)
-@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/glcanvas.cpp
+gllib_osx_cocoa_glcanvas.o: $(srcdir)/src/osx/cocoa/glcanvas.mm $(GLLIB_ODEP)
+       $(CXXC) -c -o $@ $(GLLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/glcanvas.mm
  
  
-@COND_TOOLKIT_COCOA@gllib_glcanvas.o: $(srcdir)/src/cocoa/glcanvas.mm $(GLLIB_ODEP)
-@COND_TOOLKIT_COCOA@   $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/cocoa/glcanvas.mm
+gllib_iphone_glcanvas.o: $(srcdir)/src/osx/iphone/glcanvas.mm $(GLLIB_ODEP)
+       $(CXXC) -c -o $@ $(GLLIB_OBJCXXFLAGS) $(srcdir)/src/osx/iphone/glcanvas.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@gllib_glcanvas.o: $(srcdir)/src/gtk/glcanvas.cpp $(GLLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/gtk/glcanvas.cpp
+gllib_src_cocoa_glcanvas.o: $(srcdir)/src/cocoa/glcanvas.mm $(GLLIB_ODEP)
+       $(CXXC) -c -o $@ $(GLLIB_OBJCXXFLAGS) $(srcdir)/src/cocoa/glcanvas.mm
  
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@gllib_glcanvas.o: $(srcdir)/src/gtk1/glcanvas.cpp $(GLLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/gtk1/glcanvas.cpp
+gllib_gtk_glcanvas.o: $(srcdir)/src/gtk/glcanvas.cpp $(GLLIB_ODEP)
+       $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/gtk/glcanvas.cpp
  
  
-@COND_TOOLKIT_MSW@gllib_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp $(GLLIB_ODEP)
-@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/msw/glcanvas.cpp
+gllib_gtk1_glcanvas.o: $(srcdir)/src/gtk1/glcanvas.cpp $(GLLIB_ODEP)
+       $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/gtk1/glcanvas.cpp
  
  
-@COND_TOOLKIT_WINCE@gllib_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp $(GLLIB_ODEP)
-@COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/msw/glcanvas.cpp
+gllib_os2_glcanvas.o: $(srcdir)/src/os2/glcanvas.cpp $(GLLIB_ODEP)
+       $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/os2/glcanvas.cpp
  
  
-@COND_TOOLKIT_MOTIF@gllib_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp $(GLLIB_ODEP)
-@COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/x11/glcanvas.cpp
+@COND_TOOLKIT_OSX_CARBON@gllib_glcanvas_osx.o: $(srcdir)/src/osx/glcanvas_osx.cpp $(GLLIB_ODEP)
+@COND_TOOLKIT_OSX_CARBON@      $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/osx/glcanvas_osx.cpp
  
  
-@COND_TOOLKIT_X11@gllib_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp $(GLLIB_ODEP)
-@COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/x11/glcanvas.cpp
+@COND_TOOLKIT_OSX_COCOA@gllib_glcanvas_osx.o: $(srcdir)/src/osx/glcanvas_osx.cpp $(GLLIB_ODEP)
+@COND_TOOLKIT_OSX_COCOA@       $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/osx/glcanvas_osx.cpp
  
  
-@COND_TOOLKIT_PM@gllib_glcanvas.o: $(srcdir)/src/os2/glcanvas.cpp $(GLLIB_ODEP)
-@COND_TOOLKIT_PM@      $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/os2/glcanvas.cpp
+@COND_TOOLKIT_OSX_IPHONE@gllib_glcanvas_osx.o: $(srcdir)/src/osx/glcanvas_osx.cpp $(GLLIB_ODEP)
+@COND_TOOLKIT_OSX_IPHONE@      $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/osx/glcanvas_osx.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@gllib_glx11.o: $(srcdir)/src/unix/glx11.cpp $(GLLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/unix/glx11.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@gllib_glx11.o: $(srcdir)/src/unix/glx11.cpp $(GLLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/unix/glx11.cpp
@@ -32511,18 +37181,30 @@ gllib_glcanvas_osx.o: $(srcdir)/src/osx/glcanvas_osx.cpp $(GLLIB_ODEP)
  @COND_TOOLKIT_X11@gllib_glx11.o: $(srcdir)/src/unix/glx11.cpp $(GLLIB_ODEP)
  @COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/unix/glx11.cpp
  
  @COND_TOOLKIT_X11@gllib_glx11.o: $(srcdir)/src/unix/glx11.cpp $(GLLIB_ODEP)
  @COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/unix/glx11.cpp
  
+@COND_TOOLKIT_MSW@gllib_msw_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp $(GLLIB_ODEP)
+@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/msw/glcanvas.cpp
+
+@COND_TOOLKIT_WINCE@gllib_msw_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp $(GLLIB_ODEP)
+@COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/msw/glcanvas.cpp
+
+@COND_TOOLKIT_MOTIF@gllib_x11_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp $(GLLIB_ODEP)
+@COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/x11/glcanvas.cpp
+
+@COND_TOOLKIT_X11@gllib_x11_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp $(GLLIB_ODEP)
+@COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/x11/glcanvas.cpp
+
  sound_sdl_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp
         $(CXXC) -c -o $@ $(SOUND_SDL_CXXFLAGS) $(srcdir)/src/unix/sound_sdl.cpp
  
  
  sound_sdl_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp
         $(CXXC) -c -o $@ $(SOUND_SDL_CXXFLAGS) $(srcdir)/src/unix/sound_sdl.cpp
  
  
-$(srcdir)/include/wx/stc/stc.h: \
-$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
-$(srcdir)/src/stc/stc.cpp.in \
-$(srcdir)/src/stc/stc.h.in \
-$(srcdir)/src/stc/gen_iface.py
-       cd $(srcdir)/src/stc && ./gen_iface.py
-monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
-$(srcdir)/include/wx/stc/stc.h
+@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/include/wx/stc/stc.h: \
+@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
+@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/stc.cpp.in \
+@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/stc.h.in \
+@COND_PYTHON@@COND_USE_STC_1@$(srcdir)/src/stc/gen_iface.py
+@COND_PYTHON@@COND_USE_STC_1@  cd $(srcdir)/src/stc && ./gen_iface.py
+@COND_PYTHON@@COND_USE_STC_1@monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
+@COND_PYTHON@@COND_USE_STC_1@    $(srcdir)/include/wx/stc/stc.h
  
  #
  # "make dist" target implementation:
  
  #
  # "make dist" target implementation:
@@ -32541,6 +37223,8 @@ COMMDIR  = $(WXDIR)/src/common
  HTMLDIR  = $(WXDIR)/src/html
  RICHTEXTDIR = $(WXDIR)/src/richtext
  AUIDIR =   $(WXDIR)/src/aui
  HTMLDIR  = $(WXDIR)/src/html
  RICHTEXTDIR = $(WXDIR)/src/richtext
  AUIDIR =   $(WXDIR)/src/aui
+RIBBONDIR = $(WXDIR)/src/ribbon
+PROPGRIDDIR = $(WXDIR)/src/propgrid
  STCDIR =   $(WXDIR)/src/stc
  UNIXDIR  = $(WXDIR)/src/unix
  PNGDIR   = $(WXDIR)/src/png
  STCDIR =   $(WXDIR)/src/stc
  UNIXDIR  = $(WXDIR)/src/unix
  PNGDIR   = $(WXDIR)/src/png
@@ -32656,13 +37340,18 @@ ALL_DIST: distrib_clean
         # copy wxpresets
         mkdir $(DISTDIR)/build
         mkdir $(DISTDIR)/build/bakefiles
         # copy wxpresets
         mkdir $(DISTDIR)/build
         mkdir $(DISTDIR)/build/bakefiles
+       $(CP_P) $(WXDIR)/build/bakefiles/README $(DISTDIR)/build/bakefiles
+       $(CP_P) $(WXDIR)/build/bakefiles/*.* $(DISTDIR)/build/bakefiles
         mkdir $(DISTDIR)/build/bakefiles/wxpresets
         mkdir $(DISTDIR)/build/bakefiles/wxpresets/presets
         mkdir $(DISTDIR)/build/bakefiles/wxpresets
         mkdir $(DISTDIR)/build/bakefiles/wxpresets/presets
-       mkdir $(DISTDIR)/build/bakefiles/wxpresets/sample
+       $(CP_P) $(WXDIR)/build/bakefiles/wxpresets/*.txt $(DISTDIR)/build/bakefiles/wxpresets
         $(CP_P) $(WXDIR)/build/bakefiles/wxpresets/presets/*.bkl $(DISTDIR)/build/bakefiles/wxpresets/presets
         $(CP_P) $(WXDIR)/build/bakefiles/wxpresets/presets/*.bkl $(DISTDIR)/build/bakefiles/wxpresets/presets
+       $(CP_P) $(WXDIR)/build/bakefiles/wxpresets/presets/wx_presets.py $(DISTDIR)/build/bakefiles/wxpresets/presets
+       mkdir $(DISTDIR)/build/bakefiles/wxpresets/sample
         $(CP_P) $(WXDIR)/build/bakefiles/wxpresets/sample/minimal* $(DISTDIR)/build/bakefiles/wxpresets/sample
         $(CP_P) $(WXDIR)/build/bakefiles/wxpresets/sample/config* $(DISTDIR)/build/bakefiles/wxpresets/sample
         $(CP_P) $(WXDIR)/build/bakefiles/wxpresets/sample/minimal* $(DISTDIR)/build/bakefiles/wxpresets/sample
         $(CP_P) $(WXDIR)/build/bakefiles/wxpresets/sample/config* $(DISTDIR)/build/bakefiles/wxpresets/sample
-       $(CP_P) $(WXDIR)/build/bakefiles/wxpresets/*.txt $(DISTDIR)/build/bakefiles/wxpresets
+       mkdir $(DISTDIR)/build/bakefiles/wxpresets/libsample
+       $(CP_P) $(WXDIR)/build/bakefiles/wxpresets/libsample/*.* $(DISTDIR)/build/bakefiles/wxpresets/libsample
         mkdir $(DISTDIR)/build/aclocal
         $(CP_P) $(WXDIR)/build/aclocal/*.m4 $(DISTDIR)/build/aclocal
  
         mkdir $(DISTDIR)/build/aclocal
         $(CP_P) $(WXDIR)/build/aclocal/*.m4 $(DISTDIR)/build/aclocal
  
@@ -32683,9 +37372,13 @@ ALL_GUI_DIST: ALL_DIST
         fi
         mkdir $(DISTDIR)/include/wx/meta
         mkdir $(DISTDIR)/include/wx/generic
         fi
         mkdir $(DISTDIR)/include/wx/meta
         mkdir $(DISTDIR)/include/wx/generic
+       mkdir $(DISTDIR)/include/wx/generic/private
         mkdir $(DISTDIR)/include/wx/html
         mkdir $(DISTDIR)/include/wx/richtext
         mkdir $(DISTDIR)/include/wx/aui
         mkdir $(DISTDIR)/include/wx/html
         mkdir $(DISTDIR)/include/wx/richtext
         mkdir $(DISTDIR)/include/wx/aui
+       mkdir $(DISTDIR)/include/wx/ribbon
+       mkdir $(DISTDIR)/include/wx/persist
+       mkdir $(DISTDIR)/include/wx/propgrid
         mkdir $(DISTDIR)/include/wx/stc
         mkdir $(DISTDIR)/include/wx/protocol
         mkdir $(DISTDIR)/include/wx/unix
         mkdir $(DISTDIR)/include/wx/stc
         mkdir $(DISTDIR)/include/wx/protocol
         mkdir $(DISTDIR)/include/wx/unix
@@ -32696,49 +37389,59 @@ ALL_GUI_DIST: ALL_DIST
         $(CP_P) $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx
         $(CP_P) $(INCDIR)/wx/meta/*.h $(DISTDIR)/include/wx/meta
         $(CP_P) $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
         $(CP_P) $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx
         $(CP_P) $(INCDIR)/wx/meta/*.h $(DISTDIR)/include/wx/meta
         $(CP_P) $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic
+       $(CP_P) $(INCDIR)/wx/generic/private/*.h $(DISTDIR)/include/wx/generic/private
         $(CP_P) $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
         $(CP_P) $(INCDIR)/wx/richtext/*.h $(DISTDIR)/include/wx/richtext
         $(CP_P) $(INCDIR)/wx/aui/*.h $(DISTDIR)/include/wx/aui
         $(CP_P) $(INCDIR)/wx/html/*.h $(DISTDIR)/include/wx/html
         $(CP_P) $(INCDIR)/wx/richtext/*.h $(DISTDIR)/include/wx/richtext
         $(CP_P) $(INCDIR)/wx/aui/*.h $(DISTDIR)/include/wx/aui
+       $(CP_P) $(INCDIR)/wx/ribbon/*.h $(DISTDIR)/include/wx/ribbon
+       $(CP_P) $(INCDIR)/wx/persist/*.h $(DISTDIR)/include/wx/persist
+       $(CP_P) $(INCDIR)/wx/propgrid/*.h $(DISTDIR)/include/wx/propgrid
         $(CP_P) $(INCDIR)/wx/stc/*.h $(DISTDIR)/include/wx/stc
         $(CP_P) $(INCDIR)/wx/stc/*.h $(DISTDIR)/include/wx/stc
+       $(CP_P) $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol
         $(CP_P) $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
         $(CP_P) $(INCDIR)/wx/unix/private/*.h $(DISTDIR)/include/wx/unix/private
         $(CP_P) $(INCDIR)/wx/xml/*.h $(DISTDIR)/include/wx/xml
         $(CP_P) $(INCDIR)/wx/xrc/*.h $(DISTDIR)/include/wx/xrc
         $(CP_P) $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
         $(CP_P) $(INCDIR)/wx/unix/private/*.h $(DISTDIR)/include/wx/unix/private
         $(CP_P) $(INCDIR)/wx/xml/*.h $(DISTDIR)/include/wx/xml
         $(CP_P) $(INCDIR)/wx/xrc/*.h $(DISTDIR)/include/wx/xrc
-       $(CP_P) $(INCDIR)/wx/protocol/*.h $(DISTDIR)/include/wx/protocol
-        
+
         mkdir $(DISTDIR)/art
         mkdir $(DISTDIR)/art/gtk
         mkdir $(DISTDIR)/art/motif
         $(CP_P) $(WXDIR)/art/*.xpm $(DISTDIR)/art
         $(CP_P) $(WXDIR)/art/gtk/*.xpm $(DISTDIR)/art/gtk
         $(CP_P) $(WXDIR)/art/motif/*.xpm $(DISTDIR)/art/motif
         mkdir $(DISTDIR)/art
         mkdir $(DISTDIR)/art/gtk
         mkdir $(DISTDIR)/art/motif
         $(CP_P) $(WXDIR)/art/*.xpm $(DISTDIR)/art
         $(CP_P) $(WXDIR)/art/gtk/*.xpm $(DISTDIR)/art/gtk
         $(CP_P) $(WXDIR)/art/motif/*.xpm $(DISTDIR)/art/motif
-        
+
         mkdir $(DISTDIR)/src/$(TOOLKITDIR)
         $(CP_P) $(COMMDIR)/*.cpp $(DISTDIR)/src/common
         $(CP_P) $(COMMDIR)/*.c $(DISTDIR)/src/common
         $(CP_P) $(COMMDIR)/*.inc $(DISTDIR)/src/common
         $(CP_P) $(COMMDIR)/*.mms $(DISTDIR)/src/common
         mkdir $(DISTDIR)/src/$(TOOLKITDIR)
         $(CP_P) $(COMMDIR)/*.cpp $(DISTDIR)/src/common
         $(CP_P) $(COMMDIR)/*.c $(DISTDIR)/src/common
         $(CP_P) $(COMMDIR)/*.inc $(DISTDIR)/src/common
         $(CP_P) $(COMMDIR)/*.mms $(DISTDIR)/src/common
-        
+
         mkdir $(DISTDIR)/src/xrc
         $(CP_P) $(SRCDIR)/xrc/*.cpp $(DISTDIR)/src/xrc
         mkdir $(DISTDIR)/src/xrc
         $(CP_P) $(SRCDIR)/xrc/*.cpp $(DISTDIR)/src/xrc
-        
+
         mkdir $(DISTDIR)/src/unix
         $(CP_P) $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix
         $(CP_P) $(UNIXDIR)/*.mms $(DISTDIR)/src/unix
         mkdir $(DISTDIR)/src/unix
         $(CP_P) $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix
         $(CP_P) $(UNIXDIR)/*.mms $(DISTDIR)/src/unix
-        
+
         mkdir $(DISTDIR)/src/generic
         $(CP_P) $(GENDIR)/*.cpp $(DISTDIR)/src/generic
         $(CP_P) $(GENDIR)/*.mms $(DISTDIR)/src/generic
         mkdir $(DISTDIR)/src/generic
         $(CP_P) $(GENDIR)/*.cpp $(DISTDIR)/src/generic
         $(CP_P) $(GENDIR)/*.mms $(DISTDIR)/src/generic
-        
+
         mkdir $(DISTDIR)/src/html
         $(CP_P) $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
         mkdir $(DISTDIR)/src/html
         $(CP_P) $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
-        
+
         mkdir $(DISTDIR)/src/richtext
         $(CP_P) $(RICHTEXTDIR)/*.cpp $(DISTDIR)/src/richtext
         mkdir $(DISTDIR)/src/richtext
         $(CP_P) $(RICHTEXTDIR)/*.cpp $(DISTDIR)/src/richtext
-        
+
         mkdir $(DISTDIR)/src/aui
         $(CP_P) $(AUIDIR)/*.cpp $(DISTDIR)/src/aui
         mkdir $(DISTDIR)/src/aui
         $(CP_P) $(AUIDIR)/*.cpp $(DISTDIR)/src/aui
-        
+
+       mkdir $(DISTDIR)/src/ribbon
+       $(CP_P) $(RIBBONDIR)/*.cpp $(DISTDIR)/src/ribbon
+
+       mkdir $(DISTDIR)/src/propgrid
+       $(CP_P) $(PROPGRIDDIR)/*.cpp $(DISTDIR)/src/propgrid
+
         mkdir $(DISTDIR)/src/stc
         mkdir $(DISTDIR)/src/stc/scintilla
         mkdir $(DISTDIR)/src/stc/scintilla/src
         mkdir $(DISTDIR)/src/stc
         mkdir $(DISTDIR)/src/stc/scintilla
         mkdir $(DISTDIR)/src/stc/scintilla/src
@@ -32746,17 +37449,17 @@ ALL_GUI_DIST: ALL_DIST
         $(CP_P) $(STCDIR)/*.* $(DISTDIR)/src/stc
         $(CP_P) $(STCDIR)/scintilla/src/* $(DISTDIR)/src/stc/scintilla/src
         $(CP_P) $(STCDIR)/scintilla/include/* $(DISTDIR)/src/stc/scintilla/include
         $(CP_P) $(STCDIR)/*.* $(DISTDIR)/src/stc
         $(CP_P) $(STCDIR)/scintilla/src/* $(DISTDIR)/src/stc/scintilla/src
         $(CP_P) $(STCDIR)/scintilla/include/* $(DISTDIR)/src/stc/scintilla/include
-        
+
         mkdir $(DISTDIR)/src/png
         $(CP_PR) $(PNGDIR)/* $(DISTDIR)/src/png
         mkdir $(DISTDIR)/src/png
         $(CP_PR) $(PNGDIR)/* $(DISTDIR)/src/png
-        
+
         mkdir $(DISTDIR)/src/jpeg
         $(CP_P) $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg
         $(CP_P) $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg
         $(CP_P) $(JPEGDIR)/*.vc $(DISTDIR)/src/jpeg
         $(CP_P) $(JPEGDIR)/makefile.* $(DISTDIR)/src/jpeg
         $(CP_P) $(JPEGDIR)/README $(DISTDIR)/src/jpeg
         mkdir $(DISTDIR)/src/jpeg
         $(CP_P) $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg
         $(CP_P) $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg
         $(CP_P) $(JPEGDIR)/*.vc $(DISTDIR)/src/jpeg
         $(CP_P) $(JPEGDIR)/makefile.* $(DISTDIR)/src/jpeg
         $(CP_P) $(JPEGDIR)/README $(DISTDIR)/src/jpeg
-        
+
         mkdir $(DISTDIR)/src/tiff
         mkdir $(DISTDIR)/src/tiff/config
         mkdir $(DISTDIR)/src/tiff/contrib
         mkdir $(DISTDIR)/src/tiff
         mkdir $(DISTDIR)/src/tiff/config
         mkdir $(DISTDIR)/src/tiff/contrib
@@ -32800,6 +37503,9 @@ BASE_DIST: ALL_DIST INTL_DIST
         mkdir $(DISTDIR)/include/wx/html
         mkdir $(DISTDIR)/include/wx/richtext
         mkdir $(DISTDIR)/include/wx/aui
         mkdir $(DISTDIR)/include/wx/html
         mkdir $(DISTDIR)/include/wx/richtext
         mkdir $(DISTDIR)/include/wx/aui
+       mkdir $(DISTDIR)/include/wx/ribbon
+       mkdir $(DISTDIR)/include/wx/persist
+       mkdir $(DISTDIR)/include/wx/propgrid
         mkdir $(DISTDIR)/include/wx/stc
         mkdir $(DISTDIR)/include/wx/osx
         mkdir $(DISTDIR)/include/wx/osx/carbon
         mkdir $(DISTDIR)/include/wx/stc
         mkdir $(DISTDIR)/include/wx/osx
         mkdir $(DISTDIR)/include/wx/osx/carbon
@@ -32865,7 +37571,7 @@ GTK_DIST: UNIV_DIST
         mkdir $(DISTDIR)/src/gtk/hildon
         $(CP_P) $(INCDIR)/wx/gtk/hildon/*.h $(DISTDIR)/include/wx/gtk/hildon
         $(CP_P) $(GTKDIR)/hildon/*.cpp $(DISTDIR)/src/gtk/hildon
         mkdir $(DISTDIR)/src/gtk/hildon
         $(CP_P) $(INCDIR)/wx/gtk/hildon/*.h $(DISTDIR)/include/wx/gtk/hildon
         $(CP_P) $(GTKDIR)/hildon/*.cpp $(DISTDIR)/src/gtk/hildon
-        
+
         mkdir $(DISTDIR)/src/osx
         mkdir $(DISTDIR)/src/osx/core
         $(CP_P) $(WXDIR)/src/osx/core/*.cpp $(DISTDIR)/src/osx/core
         mkdir $(DISTDIR)/src/osx
         mkdir $(DISTDIR)/src/osx/core
         $(CP_P) $(WXDIR)/src/osx/core/*.cpp $(DISTDIR)/src/osx/core
@@ -32906,7 +37612,7 @@ MOTIF_DIST: ALL_GUI_DIST
                 $(X11INC)/bitmap.h $(X11INC)/glcanvas.h $(X11INC)/private.h $(X11INC)/region.h \
                 $(DISTDIR)/include/wx/x11
  
                 $(X11INC)/bitmap.h $(X11INC)/glcanvas.h $(X11INC)/private.h $(X11INC)/region.h \
                 $(DISTDIR)/include/wx/x11
  
-MACX_DIST: ALL_GUI_DIST
+OSX_CARBON_DIST: ALL_GUI_DIST
         $(CP_P) $(INCDIR)/*.* $(DISTDIR)/include
         mkdir $(DISTDIR)/include/wx/osx/carbon
         mkdir $(DISTDIR)/include/wx/osx/carbon/private
         $(CP_P) $(INCDIR)/*.* $(DISTDIR)/include
         mkdir $(DISTDIR)/include/wx/osx/carbon
         mkdir $(DISTDIR)/include/wx/osx/carbon/private
@@ -32986,6 +37692,7 @@ MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
         mkdir $(DISTDIR)/src/msw/ole
         mkdir $(DISTDIR)/src/msw/wince
         $(CP_P) $(MSWDIR)/*.cpp $(DISTDIR)/src/msw
         mkdir $(DISTDIR)/src/msw/ole
         mkdir $(DISTDIR)/src/msw/wince
         $(CP_P) $(MSWDIR)/*.cpp $(DISTDIR)/src/msw
+       $(CP_P) $(MSWDIR)/*.rc $(DISTDIR)/src/msw
         $(CP_P) $(MSWDIR)/*.c $(DISTDIR)/src/msw
         $(CP_P) $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
         $(CP_P) $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince
         $(CP_P) $(MSWDIR)/*.c $(DISTDIR)/src/msw
         $(CP_P) $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
         $(CP_P) $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince
@@ -33075,9 +37782,12 @@ SAMPLES_DIST: ALL_GUI_DIST
         $(CP_P) $(SAMPDIR)/sample.* $(DISTDIR)/samples
         $(CP_P) $(SAMPDIR)/samples.* $(DISTDIR)/samples
  
         $(CP_P) $(SAMPDIR)/sample.* $(DISTDIR)/samples
         $(CP_P) $(SAMPDIR)/samples.* $(DISTDIR)/samples
  
-       # copy files common to all samples in a general way
-       for s in `find $(SAMPDIR) $(SAMPDIR)/html $(SAMPDIR)/mobile $(SAMPDIR)/opengl \
+       # copy files common to all samples in a general way (samples without
+       # Makefile.in in them are Windows-specific and shouldn't be included in
+       # Unix distribution)
+       for s in `find $(SAMPDIR) $(SAMPDIR)/html $(SAMPDIR)/opengl \
                     -mindepth 1 -maxdepth 1 -type d -not -name .svn`; do \
                     -mindepth 1 -maxdepth 1 -type d -not -name .svn`; do \
+           if [ ! -f $$s/Makefile.in ]; then continue; fi; \
             t="$(DISTDIR)/samples/`echo $$s | sed 's@$(SAMPDIR)/@@'`"; \
             mkdir -p $$t; \
             $(CP_P) $$s/Makefile.in \
             t="$(DISTDIR)/samples/`echo $$s | sed 's@$(SAMPDIR)/@@'`"; \
             mkdir -p $$t; \
             $(CP_P) $$s/Makefile.in \
@@ -33098,8 +37808,6 @@ SAMPLES_DIST: ALL_GUI_DIST
         $(CP_P) $(SAMPDIR)/animate/hourglass.ani $(DISTDIR)/samples/animate
         $(CP_P) $(SAMPDIR)/animate/throbber.gif $(DISTDIR)/samples/animate
  
         $(CP_P) $(SAMPDIR)/animate/hourglass.ani $(DISTDIR)/samples/animate
         $(CP_P) $(SAMPDIR)/animate/throbber.gif $(DISTDIR)/samples/animate
  
-       $(CP_P) $(SAMPDIR)/console/testdata.fc $(DISTDIR)/samples/console
-
         $(CP_P) $(SAMPDIR)/dialogs/tips.txt $(DISTDIR)/samples/dialogs
  
         $(CP_P) $(SAMPDIR)/dnd/d_and_d.txt $(DISTDIR)/samples/dnd
         $(CP_P) $(SAMPDIR)/dialogs/tips.txt $(DISTDIR)/samples/dialogs
  
         $(CP_P) $(SAMPDIR)/dnd/d_and_d.txt $(DISTDIR)/samples/dnd
@@ -33140,8 +37848,6 @@ SAMPLES_DIST: ALL_GUI_DIST
  
         $(CP_P) $(SAMPDIR)/joytest/*.wav $(DISTDIR)/samples/joytest
  
  
         $(CP_P) $(SAMPDIR)/joytest/*.wav $(DISTDIR)/samples/joytest
  
-       $(CP_P) $(SAMPDIR)/mobile/styles/*.jpg $(DISTDIR)/samples/mobile/styles
-
         $(CP_P) $(SAMPDIR)/opengl/penguin/trackball.c $(DISTDIR)/samples/opengl/penguin
         $(CP_P) $(SAMPDIR)/opengl/penguin/*.dxf.gz $(DISTDIR)/samples/opengl/penguin
         $(CP_P) $(SAMPDIR)/opengl/isosurf/*.gz $(DISTDIR)/samples/opengl/isosurf
         $(CP_P) $(SAMPDIR)/opengl/penguin/trackball.c $(DISTDIR)/samples/opengl/penguin
         $(CP_P) $(SAMPDIR)/opengl/penguin/*.dxf.gz $(DISTDIR)/samples/opengl/penguin
         $(CP_P) $(SAMPDIR)/opengl/isosurf/*.gz $(DISTDIR)/samples/opengl/isosurf
@@ -33157,15 +37863,22 @@ SAMPLES_DIST: ALL_GUI_DIST
         $(CP_P) $(SAMPDIR)/xrc/rc/*.xpm $(DISTDIR)/samples/xrc/rc
         $(CP_P) $(SAMPDIR)/xrc/rc/*.xrc $(DISTDIR)/samples/xrc/rc
         $(CP_P) $(SAMPDIR)/xrc/rc/*.gif $(DISTDIR)/samples/xrc/rc
         $(CP_P) $(SAMPDIR)/xrc/rc/*.xpm $(DISTDIR)/samples/xrc/rc
         $(CP_P) $(SAMPDIR)/xrc/rc/*.xrc $(DISTDIR)/samples/xrc/rc
         $(CP_P) $(SAMPDIR)/xrc/rc/*.gif $(DISTDIR)/samples/xrc/rc
-       $(CP_P) $(SAMPDIR)/xrc/rc/*.ico $(DISTDIR)/samples/xrc/rc
  
  UTILS_DIST: ALL_GUI_DIST
         mkdir $(DISTDIR)/utils
         $(CP_P) $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
  
  
  UTILS_DIST: ALL_GUI_DIST
         mkdir $(DISTDIR)/utils
         $(CP_P) $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
  
+       mkdir $(DISTDIR)/utils/screenshotgen
+       mkdir $(DISTDIR)/utils/screenshotgen/src
+       mkdir $(DISTDIR)/utils/screenshotgen/src/bitmaps
+       $(CP_P) $(UTILSDIR)/screenshotgen/README.txt $(DISTDIR)/utils/screenshotgen
+       $(CP_P) $(UTILSDIR)/screenshotgen/*.in $(DISTDIR)/utils/screenshotgen
+       $(CP_P) $(UTILSDIR)/screenshotgen/src/*.* $(DISTDIR)/utils/screenshotgen/src
+       $(CP_P) $(UTILSDIR)/screenshotgen/src/bitmaps/*.* $(DISTDIR)/utils/screenshotgen/src/bitmaps
+
         mkdir $(DISTDIR)/utils/ifacecheck
         mkdir $(DISTDIR)/utils/ifacecheck/src
         mkdir $(DISTDIR)/utils/ifacecheck
         mkdir $(DISTDIR)/utils/ifacecheck/src
-       $(CP_P) $(UTILSDIR)/ifacecheck/README $(DISTDIR)/utils/ifacecheck
+       $(CP_P) $(UTILSDIR)/ifacecheck/README.txt $(DISTDIR)/utils/ifacecheck
         $(CP_P) $(UTILSDIR)/ifacecheck/*.dtd $(DISTDIR)/utils/ifacecheck
         $(CP_P) $(UTILSDIR)/ifacecheck/*.xsl $(DISTDIR)/utils/ifacecheck
         $(CP_P) $(UTILSDIR)/ifacecheck/*.in $(DISTDIR)/utils/ifacecheck
         $(CP_P) $(UTILSDIR)/ifacecheck/*.dtd $(DISTDIR)/utils/ifacecheck
         $(CP_P) $(UTILSDIR)/ifacecheck/*.xsl $(DISTDIR)/utils/ifacecheck
         $(CP_P) $(UTILSDIR)/ifacecheck/*.in $(DISTDIR)/utils/ifacecheck
@@ -33213,7 +37926,6 @@ INTL_DIST:
         mkdir $(DISTDIR)/locale
         $(CP_P) $(INTLDIR)/Makefile $(DISTDIR)/locale
         $(CP_P) $(INTLDIR)/*.po $(DISTDIR)/locale
         mkdir $(DISTDIR)/locale
         $(CP_P) $(INTLDIR)/Makefile $(DISTDIR)/locale
         $(CP_P) $(INTLDIR)/*.po $(DISTDIR)/locale
-       -$(CP_P) $(INTLDIR)/*.mo $(DISTDIR)/locale
         subdirs=`cd $(INTLDIR) && ls */*.po | sed 's|/.*||' | uniq`; \
         for dir in "$$subdirs"; do                                   \
             mkdir $(DISTDIR)/locale/$$dir;                           \
         subdirs=`cd $(INTLDIR) && ls */*.po | sed 's|/.*||' | uniq`; \
         for dir in "$$subdirs"; do                                   \
             mkdir $(DISTDIR)/locale/$$dir;                           \
@@ -33225,6 +37937,7 @@ MANUAL_DIST:
         mkdir $(DISTDIR)/docs/doxygen
         mkdir $(DISTDIR)/docs/doxygen/groups
         mkdir $(DISTDIR)/docs/doxygen/images
         mkdir $(DISTDIR)/docs/doxygen
         mkdir $(DISTDIR)/docs/doxygen/groups
         mkdir $(DISTDIR)/docs/doxygen/images
+       mkdir $(DISTDIR)/docs/doxygen/images/stock
         mkdir $(DISTDIR)/docs/doxygen/images/wxgtk
         mkdir $(DISTDIR)/docs/doxygen/images/wxmac
         mkdir $(DISTDIR)/docs/doxygen/images/wxmsw
         mkdir $(DISTDIR)/docs/doxygen/images/wxgtk
         mkdir $(DISTDIR)/docs/doxygen/images/wxmac
         mkdir $(DISTDIR)/docs/doxygen/images/wxmsw
@@ -33235,28 +37948,35 @@ MANUAL_DIST:
         $(CP_P) $(DOCDIR)/doxygen/mainpages/*.h $(DISTDIR)/docs/doxygen/mainpages
         $(CP_P) $(DOCDIR)/doxygen/overviews/*.h $(DISTDIR)/docs/doxygen/overviews
         $(CP_P) $(DOCDIR)/doxygen/images/*.??? $(DISTDIR)/docs/doxygen/images
         $(CP_P) $(DOCDIR)/doxygen/mainpages/*.h $(DISTDIR)/docs/doxygen/mainpages
         $(CP_P) $(DOCDIR)/doxygen/overviews/*.h $(DISTDIR)/docs/doxygen/overviews
         $(CP_P) $(DOCDIR)/doxygen/images/*.??? $(DISTDIR)/docs/doxygen/images
+       $(CP_P) $(DOCDIR)/doxygen/images/wxgtk/*.??? $(DISTDIR)/docs/doxygen/images/stock
         $(CP_P) $(DOCDIR)/doxygen/images/wxgtk/*.??? $(DISTDIR)/docs/doxygen/images/wxgtk
         $(CP_P) $(DOCDIR)/doxygen/images/wxgtk/*.??? $(DISTDIR)/docs/doxygen/images/wxgtk
-#      $(CP_P) $(DOCDIR)/doxygen/images/wxmac/*.??? $(DISTDIR)/docs/doxygen/images/wxmac
-#      $(CP_P) $(DOCDIR)/doxygen/images/wxmsw/*.??? $(DISTDIR)/docs/doxygen/images/wxmsw
+       $(CP_P) $(DOCDIR)/doxygen/images/wxmac/*.??? $(DISTDIR)/docs/doxygen/images/wxmac
+       $(CP_P) $(DOCDIR)/doxygen/images/wxmsw/*.??? $(DISTDIR)/docs/doxygen/images/wxmsw
         mkdir $(DISTDIR)/interface
         mkdir $(DISTDIR)/interface/wx
         mkdir $(DISTDIR)/interface/wx/aui
         mkdir $(DISTDIR)/interface
         mkdir $(DISTDIR)/interface/wx
         mkdir $(DISTDIR)/interface/wx/aui
+       mkdir $(DISTDIR)/interface/wx/ribbon
         mkdir $(DISTDIR)/interface/wx/generic
         mkdir $(DISTDIR)/interface/wx/html
         mkdir $(DISTDIR)/interface/wx/msw
         mkdir $(DISTDIR)/interface/wx/msw/ole
         mkdir $(DISTDIR)/interface/wx/generic
         mkdir $(DISTDIR)/interface/wx/html
         mkdir $(DISTDIR)/interface/wx/msw
         mkdir $(DISTDIR)/interface/wx/msw/ole
+       mkdir $(DISTDIR)/interface/wx/persist
         mkdir $(DISTDIR)/interface/wx/protocol
         mkdir $(DISTDIR)/interface/wx/protocol
+       mkdir $(DISTDIR)/interface/wx/propgrid
         mkdir $(DISTDIR)/interface/wx/richtext
         mkdir $(DISTDIR)/interface/wx/stc
         mkdir $(DISTDIR)/interface/wx/xml
         mkdir $(DISTDIR)/interface/wx/xrc
         $(CP_P) $(IFACEDIR)/wx/*.h $(DISTDIR)/interface/wx
         $(CP_P) $(IFACEDIR)/wx/aui/*.h $(DISTDIR)/interface/wx/aui
         mkdir $(DISTDIR)/interface/wx/richtext
         mkdir $(DISTDIR)/interface/wx/stc
         mkdir $(DISTDIR)/interface/wx/xml
         mkdir $(DISTDIR)/interface/wx/xrc
         $(CP_P) $(IFACEDIR)/wx/*.h $(DISTDIR)/interface/wx
         $(CP_P) $(IFACEDIR)/wx/aui/*.h $(DISTDIR)/interface/wx/aui
+       $(CP_P) $(IFACEDIR)/wx/ribbon/*.h $(DISTDIR)/interface/wx/ribbon
         $(CP_P) $(IFACEDIR)/wx/generic/*.h $(DISTDIR)/interface/wx/generic
         $(CP_P) $(IFACEDIR)/wx/html/*.h $(DISTDIR)/interface/wx/html
         $(CP_P) $(IFACEDIR)/wx/msw/*.h $(DISTDIR)/interface/wx/msw
         $(CP_P) $(IFACEDIR)/wx/msw/ole/*.h $(DISTDIR)/interface/wx/msw/ole
         $(CP_P) $(IFACEDIR)/wx/generic/*.h $(DISTDIR)/interface/wx/generic
         $(CP_P) $(IFACEDIR)/wx/html/*.h $(DISTDIR)/interface/wx/html
         $(CP_P) $(IFACEDIR)/wx/msw/*.h $(DISTDIR)/interface/wx/msw
         $(CP_P) $(IFACEDIR)/wx/msw/ole/*.h $(DISTDIR)/interface/wx/msw/ole
+       $(CP_P) $(IFACEDIR)/wx/persist/*.h $(DISTDIR)/interface/wx/persist
         $(CP_P) $(IFACEDIR)/wx/protocol/*.h $(DISTDIR)/interface/wx/protocol
         $(CP_P) $(IFACEDIR)/wx/protocol/*.h $(DISTDIR)/interface/wx/protocol
+       $(CP_P) $(IFACEDIR)/wx/propgrid/*.h $(DISTDIR)/interface/wx/propgrid
         $(CP_P) $(IFACEDIR)/wx/richtext/*.h $(DISTDIR)/interface/wx/richtext
         $(CP_P) $(IFACEDIR)/wx/stc/*.h $(DISTDIR)/interface/wx/stc
         $(CP_P) $(IFACEDIR)/wx/xml/*.h $(DISTDIR)/interface/wx/xml
         $(CP_P) $(IFACEDIR)/wx/richtext/*.h $(DISTDIR)/interface/wx/richtext
         $(CP_P) $(IFACEDIR)/wx/stc/*.h $(DISTDIR)/interface/wx/stc
         $(CP_P) $(IFACEDIR)/wx/xml/*.h $(DISTDIR)/interface/wx/xml
@@ -33354,8 +38074,7 @@ bzip-dist: @GUIDIST@
         fi
  
  win-dist: MSW_ZIP_TEXT_DIST SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST INTL_DIST
         fi
  
  win-dist: MSW_ZIP_TEXT_DIST SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST INTL_DIST
-# RR: copy VC files common to all samples in a general way
-       for s in `find $(SAMPDIR) $(SAMPDIR)/html $(SAMPDIR)/mobile $(SAMPDIR)/opengl \
+       for s in `find $(SAMPDIR) $(SAMPDIR)/html $(SAMPDIR)/opengl \
                     -mindepth 1 -maxdepth 1 -type d -not -name CVS`; do \
             t="$(DISTDIR)/samples/`echo $$s | sed 's@$(SAMPDIR)/@@'`"; \
             $(CP_P) \
                     -mindepth 1 -maxdepth 1 -type d -not -name CVS`; do \
             t="$(DISTDIR)/samples/`echo $$s | sed 's@$(SAMPDIR)/@@'`"; \
             $(CP_P) \
@@ -33422,11 +38141,34 @@ rpm: bzip-dist
         -mkdir $(RPMTOP)/RPMS
         -mkdir $(RPMTOP)/SRPMS
         cp -f $(WXARCHIVE_BZIP) $(RPMTOP)/SOURCES
         -mkdir $(RPMTOP)/RPMS
         -mkdir $(RPMTOP)/SRPMS
         cp -f $(WXARCHIVE_BZIP) $(RPMTOP)/SOURCES
-       rpm -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec
-       mv -f `find $(RPMTOP) -name "wx$(TOOLKIT)*.rpm"` .
+       rpmbuild -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec
+       mv -f `find $(RPMTOP) -name "wx-*.rpm"` .
  
  
  # Include dependency info, if present:
  
  
  # Include dependency info, if present:
-@IF_GNU_MAKE@-include .deps/*.d
-
-.PHONY: all install uninstall clean distclean install_wxregex uninstall_wxregex install_wxzlib uninstall_wxzlib install_wxpng uninstall_wxpng install_wxjpeg uninstall_wxjpeg install_wxtiff uninstall_wxtiff install_wxexpat uninstall_wxexpat install_wxscintilla uninstall_wxscintilla install_monodll uninstall_monodll install_monolib uninstall_monolib install_basedll uninstall_basedll install_baselib uninstall_baselib wxbase install_netdll uninstall_netdll install_netlib uninstall_netlib wxnet install_coredll uninstall_coredll install_corelib uninstall_corelib wxcore install_advdll uninstall_advdll install_advlib uninstall_advlib wxadv install_mediadll uninstall_mediadll install_medialib uninstall_medialib wxmedia install_htmldll uninstall_htmldll install_htmllib uninstall_htmllib wxhtml install_qadll uninstall_qadll install_qalib uninstall_qalib wxqa install_xmldll uninstall_xmldll install_xmllib uninstall_xmllib wxxml install_xrcdll uninstall_xrcdll install_xrclib uninstall_xrclib wxxrc install_auidll uninstall_auidll install_auilib uninstall_auilib wxaui install_richtextdll uninstall_richtextdll install_richtextlib uninstall_richtextlib wxrichtext install_stcdll uninstall_stcdll install_stclib uninstall_stclib wxstc install_gldll uninstall_gldll install_gllib uninstall_gllib wxgl install_sound_sdl uninstall_sound_sdl samples
+@IF_GNU_MAKE@-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean install_wxregex uninstall_wxregex \
+       install_wxzlib uninstall_wxzlib install_wxpng uninstall_wxpng install_wxjpeg \
+       uninstall_wxjpeg install_wxtiff uninstall_wxtiff install_wxexpat \
+       uninstall_wxexpat install_wxscintilla uninstall_wxscintilla install_monodll \
+       uninstall_monodll install_monolib uninstall_monolib install_basedll \
+       uninstall_basedll install_baselib uninstall_baselib wxbase install_netdll \
+       uninstall_netdll install_netlib uninstall_netlib wxnet install_coredll \
+       uninstall_coredll install_corelib uninstall_corelib wxcore install_advdll \
+       uninstall_advdll install_advlib uninstall_advlib wxadv install_mediadll \
+       uninstall_mediadll install_medialib uninstall_medialib wxmedia \
+       install_htmldll uninstall_htmldll install_htmllib uninstall_htmllib wxhtml \
+       install_webviewdll uninstall_webviewdll install_webviewlib \
+       uninstall_webviewlib wxwebview install_qadll uninstall_qadll install_qalib \
+       uninstall_qalib wxqa install_xmldll uninstall_xmldll install_xmllib \
+       uninstall_xmllib wxxml install_xrcdll uninstall_xrcdll install_xrclib \
+       uninstall_xrclib wxxrc install_auidll uninstall_auidll install_auilib \
+       uninstall_auilib wxaui install_ribbondll uninstall_ribbondll \
+       install_ribbonlib uninstall_ribbonlib wxribbon install_propgriddll \
+       uninstall_propgriddll install_propgridlib uninstall_propgridlib wxpropgrid \
+       install_richtextdll uninstall_richtextdll install_richtextlib \
+       uninstall_richtextlib wxrichtext install_stcdll uninstall_stcdll \
+       install_stclib uninstall_stclib wxstc install_gldll uninstall_gldll \
+       install_gllib uninstall_gllib wxgl install_sound_sdl uninstall_sound_sdl \
+       samples