removed contrib files from the scripts

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

index d0e0729e4f97d1f60045f0cc0f26f38fbb888ba5..5781ec3a17503cac8e2eea7f18e0bae4784048b8 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.0 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
  #     Do not modify, all changes will be overwritten!
  # =========================================================================
  
@@ -26,16 +26,19 @@ 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@
+BK_DEPS = @BK_DEPS@
+BK_MAKE_PCH = @BK_MAKE_PCH@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
  bindir = @bindir@
  libdir = @libdir@
  datadir = @datadir@
  includedir = @includedir@
  DLLPREFIX = @DLLPREFIX@
  DLLPREFIX_MODULE = @DLLPREFIX_MODULE@
  bindir = @bindir@
  libdir = @libdir@
  datadir = @datadir@
  includedir = @includedir@
  DLLPREFIX = @DLLPREFIX@
  DLLPREFIX_MODULE = @DLLPREFIX_MODULE@
+LIBS = @LIBS@
  AR = @AR@
  AR = @AR@
+AROPTIONS = @AROPTIONS@
  RANLIB = @RANLIB@
  CC = @CC@
  CXX = @CXX@
  RANLIB = @RANLIB@
  CC = @CC@
  CXX = @CXX@
@@ -60,15 +63,16 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
  EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
  EXTRALIBS_SDL = @EXTRALIBS_SDL@
  HOST_SUFFIX = @HOST_SUFFIX@
  EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
  EXTRALIBS_SDL = @EXTRALIBS_SDL@
  HOST_SUFFIX = @HOST_SUFFIX@
+wx_top_builddir = @wx_top_builddir@
  
  ### Variables: ###
  
  DESTDIR = 
  
  ### Variables: ###
  
  DESTDIR = 
-WX_RELEASE = 2.7
-WX_RELEASE_NODOT = 27
-WX_VERSION = $(WX_RELEASE).1
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
-LIBDIRNAME = $(top_builddir)lib
+WX_RELEASE = 2.9
+WX_RELEASE_NODOT = 29
+WX_VERSION = $(WX_RELEASE).0
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
+LIBDIRNAME = $(wx_top_builddir)/lib
  WXREGEX_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(____SHARED) \
         $(CPPFLAGS) $(CFLAGS)
  WXREGEX_OBJECTS =  \
  WXREGEX_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(____SHARED) \
         $(CPPFLAGS) $(CFLAGS)
  WXREGEX_OBJECTS =  \
@@ -217,6 +221,91 @@ WXEXPAT_OBJECTS =  \
         wxexpat_xmlparse.o \
         wxexpat_xmlrole.o \
         wxexpat_xmltok.o
         wxexpat_xmlparse.o \
         wxexpat_xmlrole.o \
         wxexpat_xmltok.o
+WXSCINTILLA_CXXFLAGS = -I$(top_srcdir)/src/stc/scintilla/include \
+       -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
+       $(____SHARED) $(CPPFLAGS) $(CXXFLAGS)
+WXSCINTILLA_OBJECTS =  \
+       wxscintilla_AutoComplete.o \
+       wxscintilla_CallTip.o \
+       wxscintilla_CellBuffer.o \
+       wxscintilla_CharClassify.o \
+       wxscintilla_ContractionState.o \
+       wxscintilla_Document.o \
+       wxscintilla_DocumentAccessor.o \
+       wxscintilla_Editor.o \
+       wxscintilla_ExternalLexer.o \
+       wxscintilla_Indicator.o \
+       wxscintilla_KeyMap.o \
+       wxscintilla_KeyWords.o \
+       wxscintilla_LexAPDL.o \
+       wxscintilla_LexAU3.o \
+       wxscintilla_LexAVE.o \
+       wxscintilla_LexAda.o \
+       wxscintilla_LexAsm.o \
+       wxscintilla_LexAsn1.o \
+       wxscintilla_LexBaan.o \
+       wxscintilla_LexBash.o \
+       wxscintilla_LexBasic.o \
+       wxscintilla_LexBullant.o \
+       wxscintilla_LexCLW.o \
+       wxscintilla_LexCPP.o \
+       wxscintilla_LexCSS.o \
+       wxscintilla_LexCaml.o \
+       wxscintilla_LexCsound.o \
+       wxscintilla_LexConf.o \
+       wxscintilla_LexCrontab.o \
+       wxscintilla_LexEScript.o \
+       wxscintilla_LexEiffel.o \
+       wxscintilla_LexErlang.o \
+       wxscintilla_LexFlagship.o \
+       wxscintilla_LexForth.o \
+       wxscintilla_LexFortran.o \
+       wxscintilla_LexGui4Cli.o \
+       wxscintilla_LexHTML.o \
+       wxscintilla_LexHaskell.o \
+       wxscintilla_LexInno.o \
+       wxscintilla_LexKix.o \
+       wxscintilla_LexLisp.o \
+       wxscintilla_LexLout.o \
+       wxscintilla_LexLua.o \
+       wxscintilla_LexMMIXAL.o \
+       wxscintilla_LexMPT.o \
+       wxscintilla_LexMSSQL.o \
+       wxscintilla_LexMatlab.o \
+       wxscintilla_LexMetapost.o \
+       wxscintilla_LexNsis.o \
+       wxscintilla_LexOpal.o \
+       wxscintilla_LexOthers.o \
+       wxscintilla_LexPB.o \
+       wxscintilla_LexPOV.o \
+       wxscintilla_LexPS.o \
+       wxscintilla_LexPascal.o \
+       wxscintilla_LexPerl.o \
+       wxscintilla_LexPython.o \
+       wxscintilla_LexRebol.o \
+       wxscintilla_LexRuby.o \
+       wxscintilla_LexSQL.o \
+       wxscintilla_LexSmalltalk.o \
+       wxscintilla_LexTADS3.o \
+       wxscintilla_LexScriptol.o \
+       wxscintilla_LexSpecman.o \
+       wxscintilla_LexSpice.o \
+       wxscintilla_LexTCL.o \
+       wxscintilla_LexTeX.o \
+       wxscintilla_LexVB.o \
+       wxscintilla_LexVHDL.o \
+       wxscintilla_LexVerilog.o \
+       wxscintilla_LexYAML.o \
+       wxscintilla_LineMarker.o \
+       wxscintilla_PropSet.o \
+       wxscintilla_RESearch.o \
+       wxscintilla_ScintillaBase.o \
+       wxscintilla_Style.o \
+       wxscintilla_StyleContext.o \
+       wxscintilla_UniConversion.o \
+       wxscintilla_ViewStyle.o \
+       wxscintilla_WindowAccessor.o \
+       wxscintilla_XPM.o
  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 \
@@ -228,6 +317,7 @@ ALL_BASE_HEADERS =  \
         wx/beforestd.h \
         wx/buffer.h \
         wx/build.h \
         wx/beforestd.h \
         wx/buffer.h \
         wx/build.h \
+       wx/chartype.h \
         wx/chkconf.h \
         wx/clntdata.h \
         wx/cmdline.h \
         wx/chkconf.h \
         wx/clntdata.h \
         wx/cmdline.h \
@@ -252,7 +342,6 @@ ALL_BASE_HEADERS =  \
         wx/features.h \
         wx/ffile.h \
         wx/file.h \
         wx/features.h \
         wx/ffile.h \
         wx/file.h \
-       wx/fileback.h \
         wx/fileconf.h \
         wx/filefn.h \
         wx/filename.h \
         wx/fileconf.h \
         wx/filefn.h \
         wx/filename.h \
@@ -308,6 +397,8 @@ ALL_BASE_HEADERS =  \
         wx/strconv.h \
         wx/stream.h \
         wx/string.h \
         wx/strconv.h \
         wx/stream.h \
         wx/string.h \
+       wx/stringimpl.h \
+       wx/strvararg.h \
         wx/sysopt.h \
         wx/tarstrm.h \
         wx/textbuf.h \
         wx/sysopt.h \
         wx/tarstrm.h \
         wx/textbuf.h \
@@ -318,6 +409,7 @@ ALL_BASE_HEADERS =  \
         wx/tokenzr.h \
         wx/txtstrm.h \
         wx/types.h \
         wx/tokenzr.h \
         wx/txtstrm.h \
         wx/types.h \
+       wx/unichar.h \
         wx/uri.h \
         wx/utils.h \
         wx/variant.h \
         wx/uri.h \
         wx/utils.h \
         wx/variant.h \
@@ -327,6 +419,7 @@ ALL_BASE_HEADERS =  \
         wx/wfstream.h \
         wx/wx.h \
         wx/wxchar.h \
         wx/wfstream.h \
         wx/wx.h \
         wx/wxchar.h \
+       wx/wxcrt.h \
         wx/wxprec.h \
         wx/xti.h \
         wx/xtistrm.h \
         wx/wxprec.h \
         wx/xti.h \
         wx/xtistrm.h \
@@ -363,6 +456,7 @@ ALL_PORTS_BASE_HEADERS =  \
         wx/beforestd.h \
         wx/buffer.h \
         wx/build.h \
         wx/beforestd.h \
         wx/buffer.h \
         wx/build.h \
+       wx/chartype.h \
         wx/chkconf.h \
         wx/clntdata.h \
         wx/cmdline.h \
         wx/chkconf.h \
         wx/clntdata.h \
         wx/cmdline.h \
@@ -387,7 +481,6 @@ ALL_PORTS_BASE_HEADERS =  \
         wx/features.h \
         wx/ffile.h \
         wx/file.h \
         wx/features.h \
         wx/ffile.h \
         wx/file.h \
-       wx/fileback.h \
         wx/fileconf.h \
         wx/filefn.h \
         wx/filename.h \
         wx/fileconf.h \
         wx/filefn.h \
         wx/filename.h \
@@ -443,6 +536,8 @@ ALL_PORTS_BASE_HEADERS =  \
         wx/strconv.h \
         wx/stream.h \
         wx/string.h \
         wx/strconv.h \
         wx/stream.h \
         wx/string.h \
+       wx/stringimpl.h \
+       wx/strvararg.h \
         wx/sysopt.h \
         wx/tarstrm.h \
         wx/textbuf.h \
         wx/sysopt.h \
         wx/tarstrm.h \
         wx/textbuf.h \
@@ -453,6 +548,7 @@ ALL_PORTS_BASE_HEADERS =  \
         wx/tokenzr.h \
         wx/txtstrm.h \
         wx/types.h \
         wx/tokenzr.h \
         wx/txtstrm.h \
         wx/types.h \
+       wx/unichar.h \
         wx/uri.h \
         wx/utils.h \
         wx/variant.h \
         wx/uri.h \
         wx/utils.h \
         wx/variant.h \
@@ -462,6 +558,7 @@ ALL_PORTS_BASE_HEADERS =  \
         wx/wfstream.h \
         wx/wx.h \
         wx/wxchar.h \
         wx/wfstream.h \
         wx/wx.h \
         wx/wxchar.h \
+       wx/wxcrt.h \
         wx/wxprec.h \
         wx/xti.h \
         wx/xtistrm.h \
         wx/wxprec.h \
         wx/xti.h \
         wx/xtistrm.h \
@@ -530,6 +627,7 @@ ALL_BASE_SOURCES =  \
         src/common/arcall.cpp \
         src/common/arcfind.cpp \
         src/common/archive.cpp \
         src/common/arcall.cpp \
         src/common/arcfind.cpp \
         src/common/archive.cpp \
+       src/common/arrstr.cpp \
         src/common/clntdata.cpp \
         src/common/cmdline.cpp \
         src/common/config.cpp \
         src/common/clntdata.cpp \
         src/common/cmdline.cpp \
         src/common/config.cpp \
@@ -554,7 +652,6 @@ ALL_BASE_SOURCES =  \
         src/common/fmapbase.cpp \
         src/common/fs_arc.cpp \
         src/common/fs_filter.cpp \
         src/common/fmapbase.cpp \
         src/common/fs_arc.cpp \
         src/common/fs_filter.cpp \
-       src/common/fs_zip.cpp \
         src/common/hash.cpp \
         src/common/hashmap.cpp \
         src/common/init.cpp \
         src/common/hash.cpp \
         src/common/hashmap.cpp \
         src/common/init.cpp \
@@ -578,16 +675,20 @@ ALL_BASE_SOURCES =  \
         src/common/strconv.cpp \
         src/common/stream.cpp \
         src/common/string.cpp \
         src/common/strconv.cpp \
         src/common/stream.cpp \
         src/common/string.cpp \
+       src/common/stringimpl.cpp \
+       src/common/strvararg.cpp \
         src/common/sysopt.cpp \
         src/common/tarstrm.cpp \
         src/common/textbuf.cpp \
         src/common/textfile.cpp \
         src/common/tokenzr.cpp \
         src/common/txtstrm.cpp \
         src/common/sysopt.cpp \
         src/common/tarstrm.cpp \
         src/common/textbuf.cpp \
         src/common/textfile.cpp \
         src/common/tokenzr.cpp \
         src/common/txtstrm.cpp \
+       src/common/unichar.cpp \
         src/common/uri.cpp \
         src/common/variant.cpp \
         src/common/wfstream.cpp \
         src/common/uri.cpp \
         src/common/variant.cpp \
         src/common/wfstream.cpp \
-       src/common/wxchar.cpp \
+       src/common/wxcrt.cpp \
+       src/common/wxprintf.cpp \
         src/common/xti.cpp \
         src/common/xtistrm.cpp \
         src/common/zipstrm.cpp \
         src/common/xti.cpp \
         src/common/xtistrm.cpp \
         src/common/zipstrm.cpp \
@@ -674,18 +775,22 @@ MONODLL_CFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
         $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=1 \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
         $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=1 \
-       -DWXMAKINGDLL $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS)
+       -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) \
         $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
         $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
  MONODLL_CXXFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ \
         $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
         $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
         $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       -DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
+       -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) $(CXXFLAGS)
  MONODLL_OBJECTS =  \
  MONODLL_OBJECTS =  \
-       $(__monodll___win32rc) \
         monodll_appbase.o \
         monodll_arcall.o \
         monodll_arcfind.o \
         monodll_archive.o \
         monodll_appbase.o \
         monodll_arcall.o \
         monodll_arcfind.o \
         monodll_archive.o \
+       monodll_arrstr.o \
         monodll_clntdata.o \
         monodll_cmdline.o \
         monodll_config.o \
         monodll_clntdata.o \
         monodll_cmdline.o \
         monodll_config.o \
@@ -710,7 +815,6 @@ MONODLL_OBJECTS =  \
         monodll_fmapbase.o \
         monodll_fs_arc.o \
         monodll_fs_filter.o \
         monodll_fmapbase.o \
         monodll_fs_arc.o \
         monodll_fs_filter.o \
-       monodll_fs_zip.o \
         monodll_hash.o \
         monodll_hashmap.o \
         monodll_init.o \
         monodll_hash.o \
         monodll_hashmap.o \
         monodll_init.o \
@@ -734,16 +838,20 @@ MONODLL_OBJECTS =  \
         monodll_strconv.o \
         monodll_stream.o \
         monodll_string.o \
         monodll_strconv.o \
         monodll_stream.o \
         monodll_string.o \
+       monodll_stringimpl.o \
+       monodll_strvararg.o \
         monodll_sysopt.o \
         monodll_tarstrm.o \
         monodll_textbuf.o \
         monodll_textfile.o \
         monodll_tokenzr.o \
         monodll_txtstrm.o \
         monodll_sysopt.o \
         monodll_tarstrm.o \
         monodll_textbuf.o \
         monodll_textfile.o \
         monodll_tokenzr.o \
         monodll_txtstrm.o \
+       monodll_unichar.o \
         monodll_uri.o \
         monodll_variant.o \
         monodll_wfstream.o \
         monodll_uri.o \
         monodll_variant.o \
         monodll_wfstream.o \
-       monodll_wxchar.o \
+       monodll_wxcrt.o \
+       monodll_wxprintf.o \
         monodll_xti.o \
         monodll_xtistrm.o \
         monodll_zipstrm.o \
         monodll_xti.o \
         monodll_xtistrm.o \
         monodll_zipstrm.o \
@@ -769,23 +877,29 @@ MONODLL_OBJECTS =  \
         $(__MONOLIB_GUI_SRC_OBJECTS) \
         monodll_xml.o \
         monodll_xtixml.o \
         $(__MONOLIB_GUI_SRC_OBJECTS) \
         monodll_xml.o \
         monodll_xtixml.o \
-       $(__PLUGIN_ADV_SRC_OBJECTS)
+       $(__PLUGIN_ADV_SRC_OBJECTS) \
+       $(__monodll___win32rc)
  MONODLL_ODEP =  $(___pch_wxprec_monodll_wx_wxprec_h_gch___depname)
  MONOLIB_CFLAGS = $(__monolib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
  MONODLL_ODEP =  $(___pch_wxprec_monodll_wx_wxprec_h_gch___depname)
  MONOLIB_CFLAGS = $(__monolib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
-       $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=1 $(CPPFLAGS) \
-       $(CFLAGS)
+       $(__INC_ODBC_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) \
         $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
         $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
  MONOLIB_CXXFLAGS = $(__monolib_PCH_INC) -D__WX$(TOOLKIT)__ \
         $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
         $(__THREAD_DEFINE_p) $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
         $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-       -DwxUSE_BASE=1 $(CPPFLAGS) $(CXXFLAGS)
+       -DwxUSE_BASE=1 -I$(top_srcdir)/src/stc/scintilla/include \
+       -I$(top_srcdir)/src/stc/scintilla/src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \
+       $(CPPFLAGS) $(CXXFLAGS)
  MONOLIB_OBJECTS =  \
         monolib_appbase.o \
         monolib_arcall.o \
         monolib_arcfind.o \
         monolib_archive.o \
  MONOLIB_OBJECTS =  \
         monolib_appbase.o \
         monolib_arcall.o \
         monolib_arcfind.o \
         monolib_archive.o \
+       monolib_arrstr.o \
         monolib_clntdata.o \
         monolib_cmdline.o \
         monolib_config.o \
         monolib_clntdata.o \
         monolib_cmdline.o \
         monolib_config.o \
@@ -810,7 +924,6 @@ MONOLIB_OBJECTS =  \
         monolib_fmapbase.o \
         monolib_fs_arc.o \
         monolib_fs_filter.o \
         monolib_fmapbase.o \
         monolib_fs_arc.o \
         monolib_fs_filter.o \
-       monolib_fs_zip.o \
         monolib_hash.o \
         monolib_hashmap.o \
         monolib_init.o \
         monolib_hash.o \
         monolib_hashmap.o \
         monolib_init.o \
@@ -834,16 +947,20 @@ MONOLIB_OBJECTS =  \
         monolib_strconv.o \
         monolib_stream.o \
         monolib_string.o \
         monolib_strconv.o \
         monolib_stream.o \
         monolib_string.o \
+       monolib_stringimpl.o \
+       monolib_strvararg.o \
         monolib_sysopt.o \
         monolib_tarstrm.o \
         monolib_textbuf.o \
         monolib_textfile.o \
         monolib_tokenzr.o \
         monolib_txtstrm.o \
         monolib_sysopt.o \
         monolib_tarstrm.o \
         monolib_textbuf.o \
         monolib_textfile.o \
         monolib_tokenzr.o \
         monolib_txtstrm.o \
+       monolib_unichar.o \
         monolib_uri.o \
         monolib_variant.o \
         monolib_wfstream.o \
         monolib_uri.o \
         monolib_variant.o \
         monolib_wfstream.o \
-       monolib_wxchar.o \
+       monolib_wxcrt.o \
+       monolib_wxprintf.o \
         monolib_xti.o \
         monolib_xtistrm.o \
         monolib_zipstrm.o \
         monolib_xti.o \
         monolib_xtistrm.o \
         monolib_zipstrm.o \
@@ -888,6 +1005,7 @@ BASEDLL_OBJECTS =  \
         basedll_arcall.o \
         basedll_arcfind.o \
         basedll_archive.o \
         basedll_arcall.o \
         basedll_arcfind.o \
         basedll_archive.o \
+       basedll_arrstr.o \
         basedll_clntdata.o \
         basedll_cmdline.o \
         basedll_config.o \
         basedll_clntdata.o \
         basedll_cmdline.o \
         basedll_config.o \
@@ -912,7 +1030,6 @@ BASEDLL_OBJECTS =  \
         basedll_fmapbase.o \
         basedll_fs_arc.o \
         basedll_fs_filter.o \
         basedll_fmapbase.o \
         basedll_fs_arc.o \
         basedll_fs_filter.o \
-       basedll_fs_zip.o \
         basedll_hash.o \
         basedll_hashmap.o \
         basedll_init.o \
         basedll_hash.o \
         basedll_hashmap.o \
         basedll_init.o \
@@ -936,16 +1053,20 @@ BASEDLL_OBJECTS =  \
         basedll_strconv.o \
         basedll_stream.o \
         basedll_string.o \
         basedll_strconv.o \
         basedll_stream.o \
         basedll_string.o \
+       basedll_stringimpl.o \
+       basedll_strvararg.o \
         basedll_sysopt.o \
         basedll_tarstrm.o \
         basedll_textbuf.o \
         basedll_textfile.o \
         basedll_tokenzr.o \
         basedll_txtstrm.o \
         basedll_sysopt.o \
         basedll_tarstrm.o \
         basedll_textbuf.o \
         basedll_textfile.o \
         basedll_tokenzr.o \
         basedll_txtstrm.o \
+       basedll_unichar.o \
         basedll_uri.o \
         basedll_variant.o \
         basedll_wfstream.o \
         basedll_uri.o \
         basedll_variant.o \
         basedll_wfstream.o \
-       basedll_wxchar.o \
+       basedll_wxcrt.o \
+       basedll_wxprintf.o \
         basedll_xti.o \
         basedll_xtistrm.o \
         basedll_zipstrm.o \
         basedll_xti.o \
         basedll_xtistrm.o \
         basedll_zipstrm.o \
@@ -973,6 +1094,7 @@ BASELIB_OBJECTS =  \
         baselib_arcall.o \
         baselib_arcfind.o \
         baselib_archive.o \
         baselib_arcall.o \
         baselib_arcfind.o \
         baselib_archive.o \
+       baselib_arrstr.o \
         baselib_clntdata.o \
         baselib_cmdline.o \
         baselib_config.o \
         baselib_clntdata.o \
         baselib_cmdline.o \
         baselib_config.o \
@@ -997,7 +1119,6 @@ BASELIB_OBJECTS =  \
         baselib_fmapbase.o \
         baselib_fs_arc.o \
         baselib_fs_filter.o \
         baselib_fmapbase.o \
         baselib_fs_arc.o \
         baselib_fs_filter.o \
-       baselib_fs_zip.o \
         baselib_hash.o \
         baselib_hashmap.o \
         baselib_init.o \
         baselib_hash.o \
         baselib_hashmap.o \
         baselib_init.o \
@@ -1021,16 +1142,20 @@ BASELIB_OBJECTS =  \
         baselib_strconv.o \
         baselib_stream.o \
         baselib_string.o \
         baselib_strconv.o \
         baselib_stream.o \
         baselib_string.o \
+       baselib_stringimpl.o \
+       baselib_strvararg.o \
         baselib_sysopt.o \
         baselib_tarstrm.o \
         baselib_textbuf.o \
         baselib_textfile.o \
         baselib_tokenzr.o \
         baselib_txtstrm.o \
         baselib_sysopt.o \
         baselib_tarstrm.o \
         baselib_textbuf.o \
         baselib_textfile.o \
         baselib_tokenzr.o \
         baselib_txtstrm.o \
+       baselib_unichar.o \
         baselib_uri.o \
         baselib_variant.o \
         baselib_wfstream.o \
         baselib_uri.o \
         baselib_variant.o \
         baselib_wfstream.o \
-       baselib_wxchar.o \
+       baselib_wxcrt.o \
+       baselib_wxprintf.o \
         baselib_xti.o \
         baselib_xtistrm.o \
         baselib_zipstrm.o \
         baselib_xti.o \
         baselib_xtistrm.o \
         baselib_zipstrm.o \
@@ -1321,6 +1446,7 @@ 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_collpane.o \
         xrcdll_xh_combo.o \
         xrcdll_xh_datectrl.o \
         xrcdll_xh_dirpicker.o \
         xrcdll_xh_combo.o \
         xrcdll_xh_datectrl.o \
         xrcdll_xh_dirpicker.o \
@@ -1381,6 +1507,7 @@ 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_collpane.o \
         xrclib_xh_combo.o \
         xrclib_xh_datectrl.o \
         xrclib_xh_dirpicker.o \
         xrclib_xh_combo.o \
         xrclib_xh_datectrl.o \
         xrclib_xh_dirpicker.o \
@@ -1482,6 +1609,31 @@ RICHTEXTLIB_OBJECTS =  \
         richtextlib_richtextstyledlg.o \
         richtextlib_richtextprint.o
  RICHTEXTLIB_ODEP =  $(___pch_wxprec_richtextlib_wx_wxprec_h_gch___depname)
         richtextlib_richtextstyledlg.o \
         richtextlib_richtextprint.o
  RICHTEXTLIB_ODEP =  $(___pch_wxprec_richtextlib_wx_wxprec_h_gch___depname)
+STCDLL_CXXFLAGS = $(__stcdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_ODBC_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) $(CPPFLAGS) $(CXXFLAGS)
+STCDLL_OBJECTS =  \
+       $(__stcdll___win32rc) \
+       stcdll_stc.o \
+       stcdll_PlatWX.o \
+       stcdll_ScintillaWX.o
+STCDLL_ODEP =  $(___pch_wxprec_stcdll_wx_wxprec_h_gch___depname)
+STCLIB_CXXFLAGS = $(__stclib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
+       $(__INC_ODBC_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 \
+       $(CPPFLAGS) $(CXXFLAGS)
+STCLIB_OBJECTS =  \
+       stclib_stc.o \
+       stclib_PlatWX.o \
+       stclib_ScintillaWX.o
+STCLIB_ODEP =  $(___pch_wxprec_stclib_wx_wxprec_h_gch___depname)
  GLDLL_CXXFLAGS = $(__gldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
  GLDLL_CXXFLAGS = $(__gldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
@@ -1489,14 +1641,16 @@ GLDLL_CXXFLAGS = $(__gldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         -DWXMAKINGDLL_GL $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
  GLDLL_OBJECTS =  \
         $(__gldll___win32rc) \
         -DWXMAKINGDLL_GL $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
  GLDLL_OBJECTS =  \
         $(__gldll___win32rc) \
-       $(__OPENGL_SRC_OBJECTS)
+       gldll_glcmn.o \
+       $(__OPENGL_SRC_PLATFORM_OBJECTS)
  GLDLL_ODEP =  $(___pch_wxprec_gldll_wx_wxprec_h_gch___depname)
  GLLIB_CXXFLAGS = $(__gllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
         $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CXXFLAGS)
  GLLIB_OBJECTS =  \
  GLDLL_ODEP =  $(___pch_wxprec_gldll_wx_wxprec_h_gch___depname)
  GLLIB_CXXFLAGS = $(__gllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
         $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
         $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) \
         $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CXXFLAGS)
  GLLIB_OBJECTS =  \
-       $(__OPENGL_SRC_OBJECTS_1)
+       gllib_glcmn.o \
+       $(__OPENGL_SRC_PLATFORM_OBJECTS_1)
  GLLIB_ODEP =  $(___pch_wxprec_gllib_wx_wxprec_h_gch___depname)
  SOUND_SDL_CXXFLAGS = -DWXUSINGDLL -DwxUSE_GUI=0 $(PIC_FLAG) $(CPPFLAGS) \
         $(CXXFLAGS)
  GLLIB_ODEP =  $(___pch_wxprec_gllib_wx_wxprec_h_gch___depname)
  SOUND_SDL_CXXFLAGS = -DWXUSINGDLL -DwxUSE_GUI=0 $(PIC_FLAG) $(CPPFLAGS) \
         $(CXXFLAGS)
@@ -1508,9 +1662,9 @@ LOCALE_MSW_LINGUAS =  it
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CCC = $(CC)
  ### Conditionally set variables: ###
  
  @COND_DEPS_TRACKING_0@CCC = $(CC)
-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)
+@COND_DEPS_TRACKING_1@CCC = $(BK_DEPS) $(CC)
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
  @COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
  @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
  @COND_PLATFORM_MACOSX_1@       -compatibility_version 1.0 -current_version 1.0
  @COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
  @COND_PLATFORM_MACOSX_1@WXMACVERSION_CMD = \
  @COND_PLATFORM_MACOSX_1@       -compatibility_version 1.0 -current_version 1.0
@@ -1537,26 +1691,36 @@ COND_WXUSE_REGEX_BUILTIN___wxregex___depname = \
  @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_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_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_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_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_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_PLATFORM_MACOSX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
  @COND_PLATFORM_MACOS_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_apple.o
  @COND_PLATFORM_MSDOS_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_msdos.o
  @COND_PLATFORM_MACOSX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
  @COND_PLATFORM_MACOS_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_apple.o
  @COND_PLATFORM_MSDOS_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_msdos.o
@@ -1568,11 +1732,22 @@ COND_WXUSE_ODBC_BUILTIN___wxodbc___depname = \
  @COND_WXUSE_ODBC_BUILTIN@__wxodbc___depname = $(COND_WXUSE_ODBC_BUILTIN___wxodbc___depname)
  @COND_SHARED_0_WXUSE_ODBC_BUILTIN@__install_wxodbc___depname \
  @COND_SHARED_0_WXUSE_ODBC_BUILTIN@     = install_wxodbc
  @COND_WXUSE_ODBC_BUILTIN@__wxodbc___depname = $(COND_WXUSE_ODBC_BUILTIN___wxodbc___depname)
  @COND_SHARED_0_WXUSE_ODBC_BUILTIN@__install_wxodbc___depname \
  @COND_SHARED_0_WXUSE_ODBC_BUILTIN@     = install_wxodbc
+@COND_SHARED_0_WXUSE_ODBC_BUILTIN@__uninstall_wxodbc___depname \
+@COND_SHARED_0_WXUSE_ODBC_BUILTIN@     = uninstall_wxodbc
  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_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_USE_STC_1___wxscintilla___depname = \
+       $(LIBDIRNAME)/$(LIBPREFIX)wxscintilla$(WXDEBUGFLAG)$(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_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)
@@ -1590,15 +1765,16 @@ COND_WXUSE_EXPAT_BUILTIN___wxexpat___depname = \
  @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_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_COCOA@OPENGL_HDR = wx/cocoa/glcanvas.h
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@OPENGL_HDR = wx/gtk1/glcanvas.h
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@OPENGL_HDR = wx/gtk/glcanvas.h
-@COND_TOOLKIT_MAC@OPENGL_HDR = wx/mac/carbon/glcanvas.h
-@COND_TOOLKIT_MOTIF@OPENGL_HDR = wx/x11/glcanvas.h
-@COND_TOOLKIT_MSW@OPENGL_HDR = wx/msw/glcanvas.h
-@COND_TOOLKIT_PM@OPENGL_HDR = wx/os2/glcanvas.h
-@COND_TOOLKIT_WINCE@OPENGL_HDR = wx/msw/glcanvas.h
-@COND_TOOLKIT_X11@OPENGL_HDR = wx/x11/glcanvas.h
+@COND_TOOLKIT_MSW@MSW_HTML_HDR = wx/msw/helpbest.h
+@COND_TOOLKIT_COCOA@OPENGL_HDR_PLATFORM = wx/cocoa/glcanvas.h
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@OPENGL_HDR_PLATFORM = wx/gtk1/glcanvas.h
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@OPENGL_HDR_PLATFORM = wx/gtk/glcanvas.h
+@COND_TOOLKIT_MAC@OPENGL_HDR_PLATFORM = wx/mac/glcanvas.h \
+@COND_TOOLKIT_MAC@     wx/mac/carbon/glcanvas.h
+@COND_TOOLKIT_MOTIF@OPENGL_HDR_PLATFORM = wx/x11/glcanvas.h
+@COND_TOOLKIT_MSW@OPENGL_HDR_PLATFORM = wx/msw/glcanvas.h
+@COND_TOOLKIT_WINCE@OPENGL_HDR_PLATFORM = wx/msw/glcanvas.h
+@COND_TOOLKIT_X11@OPENGL_HDR_PLATFORM = wx/x11/glcanvas.h
  COND_TOOLKIT__BASE_MACOSX_HDR =  \
         wx/unix/apptbase.h \
         wx/unix/apptrait.h \
  COND_TOOLKIT__BASE_MACOSX_HDR =  \
         wx/unix/apptbase.h \
         wx/unix/apptrait.h \
@@ -1742,7 +1918,9 @@ COND_TOOLKIT_DFB_LOWLEVEL_HDR =  \
         wx/dfb/dfbptr.h \
         wx/dfb/evtloop.h \
         wx/dfb/font.h \
         wx/dfb/dfbptr.h \
         wx/dfb/evtloop.h \
         wx/dfb/font.h \
+       wx/dfb/nonownedwnd.h \
         wx/dfb/pen.h \
         wx/dfb/pen.h \
+       wx/dfb/popupwin.h \
         wx/dfb/private.h \
         wx/dfb/region.h \
         wx/dfb/toplevel.h \
         wx/dfb/private.h \
         wx/dfb/region.h \
         wx/dfb/toplevel.h \
@@ -1789,6 +1967,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_LOWLEVEL_HDR =  \
         wx/generic/icon.h \
         wx/generic/paletteg.h \
         wx/gtk/app.h \
         wx/generic/icon.h \
         wx/generic/paletteg.h \
         wx/gtk/app.h \
+       wx/gtk/assertdlg_gtk.h \
         wx/gtk/bitmap.h \
         wx/gtk/brush.h \
         wx/gtk/clipbrd.h \
         wx/gtk/bitmap.h \
         wx/gtk/brush.h \
         wx/gtk/clipbrd.h \
@@ -1832,7 +2011,6 @@ COND_TOOLKIT_MGL_LOWLEVEL_HDR =  \
         wx/mgl/dcmemory.h \
         wx/mgl/dcscreen.h \
         wx/mgl/font.h \
         wx/mgl/dcmemory.h \
         wx/mgl/dcscreen.h \
         wx/mgl/font.h \
-       wx/mgl/fontutil.h \
         wx/mgl/palette.h \
         wx/mgl/pen.h \
         wx/mgl/popupwin.h \
         wx/mgl/palette.h \
         wx/mgl/pen.h \
         wx/mgl/popupwin.h \
@@ -1971,6 +2149,7 @@ COND_TOOLKIT_COCOA_GUI_HDR =  \
         wx/cocoa/textctrl.h \
         wx/cocoa/timer.h \
         wx/cocoa/toolbar.h \
         wx/cocoa/textctrl.h \
         wx/cocoa/timer.h \
         wx/cocoa/toolbar.h \
+       wx/cocoa/tooltip.h \
         wx/cocoa/toplevel.h \
         wx/cocoa/window.h \
         wx/generic/caret.h \
         wx/cocoa/toplevel.h \
         wx/cocoa/window.h \
         wx/generic/caret.h \
@@ -2037,6 +2216,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_GUI_HDR =  \
         wx/gtk/button.h \
         wx/gtk/checkbox.h \
         wx/gtk/checklst.h \
         wx/gtk/button.h \
         wx/gtk/checkbox.h \
         wx/gtk/checklst.h \
+       wx/gtk/collpane.h \
         wx/gtk/colordlg.h \
         wx/gtk/choice.h \
         wx/gtk/combobox.h \
         wx/gtk/colordlg.h \
         wx/gtk/choice.h \
         wx/gtk/combobox.h \
@@ -2110,7 +2290,6 @@ COND_TOOLKIT_MAC_GUI_HDR =  \
         wx/mac/fontdlg.h \
         wx/mac/frame.h \
         wx/mac/gauge.h \
         wx/mac/fontdlg.h \
         wx/mac/frame.h \
         wx/mac/gauge.h \
-       wx/mac/glcanvas.h \
         wx/mac/gsockmac.h \
         wx/mac/helpxxxx.h \
         wx/mac/icon.h \
         wx/mac/gsockmac.h \
         wx/mac/helpxxxx.h \
         wx/mac/icon.h \
@@ -2143,6 +2322,7 @@ COND_TOOLKIT_MAC_GUI_HDR =  \
         wx/mac/sound.h \
         wx/mac/spinbutt.h \
         wx/mac/spinctrl.h \
         wx/mac/sound.h \
         wx/mac/spinbutt.h \
         wx/mac/spinctrl.h \
+       wx/mac/srchctrl.h \
         wx/mac/statbmp.h \
         wx/mac/statbox.h \
         wx/mac/statline.h \
         wx/mac/statbmp.h \
         wx/mac/statbox.h \
         wx/mac/statline.h \
@@ -2216,6 +2396,9 @@ COND_TOOLKIT_MAC_GUI_HDR =  \
         wx/mac/carbon/printdlg.h \
         wx/mac/carbon/printmac.h \
         wx/mac/carbon/private.h \
         wx/mac/carbon/printdlg.h \
         wx/mac/carbon/printmac.h \
         wx/mac/carbon/private.h \
+       wx/mac/carbon/private/mactext.h \
+       wx/mac/carbon/private/overlay.h \
+       wx/mac/carbon/private/print.h \
         wx/mac/carbon/radiobox.h \
         wx/mac/carbon/radiobut.h \
         wx/mac/carbon/region.h \
         wx/mac/carbon/radiobox.h \
         wx/mac/carbon/radiobut.h \
         wx/mac/carbon/region.h \
@@ -2223,6 +2406,7 @@ COND_TOOLKIT_MAC_GUI_HDR =  \
         wx/mac/carbon/slider.h \
         wx/mac/carbon/spinbutt.h \
         wx/mac/carbon/spinctrl.h \
         wx/mac/carbon/slider.h \
         wx/mac/carbon/spinbutt.h \
         wx/mac/carbon/spinctrl.h \
+       wx/mac/carbon/srchctrl.h \
         wx/mac/carbon/statbmp.h \
         wx/mac/carbon/statbox.h \
         wx/mac/carbon/statline.h \
         wx/mac/carbon/statbmp.h \
         wx/mac/carbon/statbox.h \
         wx/mac/carbon/statline.h \
@@ -2630,54 +2814,38 @@ COND_TOOLKIT_WINCE_GUI_HDR =  \
         wx/msw/wince/textctrlce.h \
         wx/msw/wince/resources.h
  @COND_TOOLKIT_WINCE@GUI_HDR = $(COND_TOOLKIT_WINCE_GUI_HDR)
         wx/msw/wince/textctrlce.h \
         wx/msw/wince/resources.h
  @COND_TOOLKIT_WINCE@GUI_HDR = $(COND_TOOLKIT_WINCE_GUI_HDR)
-COND_TOOLKIT_COCOA_ADVANCED_PLATFORM_HDR =  \
-       wx/generic/animate.h \
-       wx/cocoa/taskbar.h \
-       wx/mac/corefoundation/joystick.h
-@COND_TOOLKIT_COCOA@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_COCOA_ADVANCED_PLATFORM_HDR)
-COND_TOOLKIT_GTK_TOOLKIT_VERSION__ADVANCED_PLATFORM_HDR =  \
-       wx/unix/joystick.h \
-       wx/unix/sound.h \
-       wx/unix/taskbarx11.h \
-       wx/generic/animate.h
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION__ADVANCED_PLATFORM_HDR)
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@ADVANCED_PLATFORM_HDR \
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@     = wx/unix/joystick.h wx/unix/sound.h \
+@COND_PLATFORM_UNIX_1_TOOLKIT_MGL@     wx/unix/taskbarx11.h
+@COND_TOOLKIT_COCOA@ADVANCED_PLATFORM_HDR = \
+@COND_TOOLKIT_COCOA@   wx/cocoa/taskbar.h wx/mac/corefoundation/joystick.h
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@ADVANCED_PLATFORM_HDR \
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    = wx/unix/joystick.h wx/unix/sound.h \
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    wx/unix/taskbarx11.h
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_HDR =  \
         wx/unix/joystick.h \
         wx/unix/sound.h \
         wx/unix/taskbarx11.h \
  COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_HDR =  \
         wx/unix/joystick.h \
         wx/unix/sound.h \
         wx/unix/taskbarx11.h \
-       wx/generic/animate.h \
         wx/gtk/animate.h \
         wx/gtk/animate.h \
-       wx/gtk/collpane.h
+       wx/gtk/hyperlink.h
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_HDR)
  COND_TOOLKIT_MAC_ADVANCED_PLATFORM_HDR =  \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_HDR)
  COND_TOOLKIT_MAC_ADVANCED_PLATFORM_HDR =  \
-       wx/generic/animate.h \
         wx/mac/carbon/drawer.h \
         wx/mac/carbon/sound.h \
         wx/mac/carbon/taskbarosx.h \
         wx/mac/corefoundation/joystick.h
  @COND_TOOLKIT_MAC@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_MAC_ADVANCED_PLATFORM_HDR)
         wx/mac/carbon/drawer.h \
         wx/mac/carbon/sound.h \
         wx/mac/carbon/taskbarosx.h \
         wx/mac/corefoundation/joystick.h
  @COND_TOOLKIT_MAC@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_MAC_ADVANCED_PLATFORM_HDR)
-COND_TOOLKIT_MOTIF_ADVANCED_PLATFORM_HDR =  \
-       wx/unix/joystick.h \
-       wx/unix/sound.h \
-       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/sound.h \
-       wx/msw/taskbar.h \
-       wx/msw/joystick.h
-@COND_TOOLKIT_MSW@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_MSW_ADVANCED_PLATFORM_HDR)
-@COND_TOOLKIT_PM@ADVANCED_PLATFORM_HDR = \
-@COND_TOOLKIT_PM@      wx/generic/animate.h wx/os2/joystick.h wx/os2/sound.h
+@COND_TOOLKIT_MOTIF@ADVANCED_PLATFORM_HDR = \
+@COND_TOOLKIT_MOTIF@   wx/unix/joystick.h wx/unix/sound.h \
+@COND_TOOLKIT_MOTIF@   wx/unix/taskbarx11.h
+@COND_TOOLKIT_MSW@ADVANCED_PLATFORM_HDR = wx/msw/sound.h \
+@COND_TOOLKIT_MSW@     wx/msw/taskbar.h wx/msw/joystick.h
+@COND_TOOLKIT_PM@ADVANCED_PLATFORM_HDR = wx/os2/joystick.h \
+@COND_TOOLKIT_PM@      wx/os2/sound.h
  @COND_TOOLKIT_WINCE@ADVANCED_PLATFORM_HDR = \
  @COND_TOOLKIT_WINCE@ADVANCED_PLATFORM_HDR = \
-@COND_TOOLKIT_WINCE@   wx/generic/animate.h wx/msw/sound.h wx/msw/taskbar.h
-COND_TOOLKIT_X11_ADVANCED_PLATFORM_HDR =  \
-       wx/unix/joystick.h \
-       wx/unix/sound.h \
-       wx/unix/taskbarx11.h \
-       wx/generic/animate.h
-@COND_TOOLKIT_X11@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_X11_ADVANCED_PLATFORM_HDR)
+@COND_TOOLKIT_WINCE@   wx/msw/sound.h wx/msw/taskbar.h
+@COND_TOOLKIT_X11@ADVANCED_PLATFORM_HDR = \
+@COND_TOOLKIT_X11@     wx/unix/joystick.h wx/unix/sound.h wx/unix/taskbarx11.h
  @COND_TOOLKIT_MSW@ADVANCED_PLATFORM_NATIVE_HDR = wx/msw/datectrl.h
  @COND_TOOLKIT_WINCE@ADVANCED_PLATFORM_NATIVE_HDR = wx/msw/datectrl.h
  COND_WXUNIV_0_ADVANCED_HDR =  \
  @COND_TOOLKIT_MSW@ADVANCED_PLATFORM_NATIVE_HDR = wx/msw/datectrl.h
  @COND_TOOLKIT_WINCE@ADVANCED_PLATFORM_NATIVE_HDR = wx/msw/datectrl.h
  COND_WXUNIV_0_ADVANCED_HDR =  \
@@ -2685,21 +2853,21 @@ COND_WXUNIV_0_ADVANCED_HDR =  \
         wx/animdecod.h \
         wx/bmpcbox.h \
         wx/calctrl.h \
         wx/animdecod.h \
         wx/bmpcbox.h \
         wx/calctrl.h \
-       wx/collpane.h \
         wx/dataview.h \
         wx/dateevt.h \
         wx/dcbuffer.h \
         wx/aboutdlg.h \
         wx/generic/aboutdlgg.h \
         wx/dataview.h \
         wx/dateevt.h \
         wx/dcbuffer.h \
         wx/aboutdlg.h \
         wx/generic/aboutdlgg.h \
+       wx/generic/animate.h \
         wx/generic/bmpcbox.h \
         wx/generic/calctrl.h \
         wx/generic/bmpcbox.h \
         wx/generic/calctrl.h \
-       wx/generic/collpaneg.h \
         wx/generic/datectrl.h \
         wx/generic/dataview.h \
         wx/generic/grid.h \
         wx/generic/gridctrl.h \
         wx/generic/gridsel.h \
         wx/generic/helpext.h \
         wx/generic/datectrl.h \
         wx/generic/dataview.h \
         wx/generic/grid.h \
         wx/generic/gridctrl.h \
         wx/generic/gridsel.h \
         wx/generic/helpext.h \
+       wx/generic/hyperlink.h \
         wx/generic/laywin.h \
         wx/generic/propdlg.h \
         wx/generic/sashwin.h \
         wx/generic/laywin.h \
         wx/generic/propdlg.h \
         wx/generic/sashwin.h \
@@ -2716,7 +2884,6 @@ COND_WXUNIV_0_ADVANCED_HDR =  \
         wx/splash.h \
         wx/taskbar.h \
         wx/tipdlg.h \
         wx/splash.h \
         wx/taskbar.h \
         wx/tipdlg.h \
-       wx/wave.h \
         wx/wizard.h \
         wx/datectrl.h \
         wx/dataview.h \
         wx/wizard.h \
         wx/datectrl.h \
         wx/dataview.h \
@@ -2728,21 +2895,21 @@ COND_WXUNIV_1_ADVANCED_HDR =  \
         wx/animdecod.h \
         wx/bmpcbox.h \
         wx/calctrl.h \
         wx/animdecod.h \
         wx/bmpcbox.h \
         wx/calctrl.h \
-       wx/collpane.h \
         wx/dataview.h \
         wx/dateevt.h \
         wx/dcbuffer.h \
         wx/aboutdlg.h \
         wx/generic/aboutdlgg.h \
         wx/dataview.h \
         wx/dateevt.h \
         wx/dcbuffer.h \
         wx/aboutdlg.h \
         wx/generic/aboutdlgg.h \
+       wx/generic/animate.h \
         wx/generic/bmpcbox.h \
         wx/generic/calctrl.h \
         wx/generic/bmpcbox.h \
         wx/generic/calctrl.h \
-       wx/generic/collpaneg.h \
         wx/generic/datectrl.h \
         wx/generic/dataview.h \
         wx/generic/grid.h \
         wx/generic/gridctrl.h \
         wx/generic/gridsel.h \
         wx/generic/helpext.h \
         wx/generic/datectrl.h \
         wx/generic/dataview.h \
         wx/generic/grid.h \
         wx/generic/gridctrl.h \
         wx/generic/gridsel.h \
         wx/generic/helpext.h \
+       wx/generic/hyperlink.h \
         wx/generic/laywin.h \
         wx/generic/propdlg.h \
         wx/generic/sashwin.h \
         wx/generic/laywin.h \
         wx/generic/propdlg.h \
         wx/generic/sashwin.h \
@@ -2759,7 +2926,6 @@ COND_WXUNIV_1_ADVANCED_HDR =  \
         wx/splash.h \
         wx/taskbar.h \
         wx/tipdlg.h \
         wx/splash.h \
         wx/taskbar.h \
         wx/tipdlg.h \
-       wx/wave.h \
         wx/wizard.h \
         $(ADVANCED_PLATFORM_HDR)
  @COND_WXUNIV_1@ADVANCED_HDR = $(COND_WXUNIV_1_ADVANCED_HDR)
         wx/wizard.h \
         $(ADVANCED_PLATFORM_HDR)
  @COND_WXUNIV_1@ADVANCED_HDR = $(COND_WXUNIV_1_ADVANCED_HDR)
@@ -2830,6 +2996,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
         wx/choicdlg.h \
         wx/choice.h \
         wx/cmndata.h \
         wx/choicdlg.h \
         wx/choice.h \
         wx/cmndata.h \
+       wx/collpane.h \
         wx/combo.h \
         wx/combobox.h \
         wx/control.h \
         wx/combo.h \
         wx/combobox.h \
         wx/control.h \
@@ -2841,6 +3008,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
         wx/dcmemory.h \
         wx/dcprint.h \
         wx/dcscreen.h \
         wx/dcmemory.h \
         wx/dcprint.h \
         wx/dcscreen.h \
+       wx/dcsvg.h \
         wx/dialog.h \
         wx/dirdlg.h \
         wx/dragimag.h \
         wx/dialog.h \
         wx/dirdlg.h \
         wx/dragimag.h \
@@ -2875,6 +3043,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
         wx/generic/scrolwin.h \
         wx/generic/spinctlg.h \
         wx/generic/splitter.h \
         wx/generic/scrolwin.h \
         wx/generic/spinctlg.h \
         wx/generic/splitter.h \
+       wx/generic/srchctlg.h \
         wx/generic/textdlgg.h \
         wx/generic/timer.h \
         wx/generic/treectlg.h \
         wx/generic/textdlgg.h \
         wx/generic/timer.h \
         wx/generic/treectlg.h \
@@ -2891,6 +3060,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
         wx/palette.h \
         wx/panel.h \
         wx/pen.h \
         wx/palette.h \
         wx/panel.h \
         wx/pen.h \
+       wx/position.h \
         wx/radiobox.h \
         wx/radiobut.h \
         wx/renderer.h \
         wx/radiobox.h \
         wx/radiobut.h \
         wx/renderer.h \
@@ -2951,7 +3121,6 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
         wx/gdiobj.h \
         wx/geometry.h \
         wx/gifdecod.h \
         wx/gdiobj.h \
         wx/geometry.h \
         wx/gifdecod.h \
-       wx/glcanvas.h \
         wx/help.h \
         wx/helpbase.h \
         wx/helpwin.h \
         wx/help.h \
         wx/helpbase.h \
         wx/helpwin.h \
@@ -2965,6 +3134,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
         wx/imagpcx.h \
         wx/imagpng.h \
         wx/imagpnm.h \
         wx/imagpcx.h \
         wx/imagpng.h \
         wx/imagpnm.h \
+       wx/imagtga.h \
         wx/imagtiff.h \
         wx/imagxpm.h \
         wx/listbase.h \
         wx/imagtiff.h \
         wx/imagxpm.h \
         wx/listbase.h \
@@ -2974,6 +3144,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
         wx/menuitem.h \
         wx/metafile.h \
         wx/minifram.h \
         wx/menuitem.h \
         wx/metafile.h \
         wx/minifram.h \
+       wx/nonownedwnd.h \
         wx/notebook.h \
         wx/ownerdrw.h \
         wx/paper.h \
         wx/notebook.h \
         wx/ownerdrw.h \
         wx/paper.h \
@@ -2991,6 +3162,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
         wx/spinbutt.h \
         wx/spinctrl.h \
         wx/splitter.h \
         wx/spinbutt.h \
         wx/spinctrl.h \
         wx/splitter.h \
+       wx/srchctrl.h \
         wx/statline.h \
         wx/tab.h \
         wx/tabctrl.h \
         wx/statline.h \
         wx/tab.h \
         wx/tabctrl.h \
@@ -3032,8 +3204,9 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
         wx/html/winpars.h \
         wx/wxhtml.h \
         wx/htmllbox.h \
         wx/html/winpars.h \
         wx/wxhtml.h \
         wx/htmllbox.h \
-       wx/msw/helpbest.h \
-       $(OPENGL_HDR) \
+       $(MSW_HTML_HDR) \
+       wx/glcanvas.h \
+       $(OPENGL_HDR_PLATFORM) \
         wx/debugrpt.h \
         wx/dbgrid.h \
         wx/xrc/xh_all.h \
         wx/debugrpt.h \
         wx/dbgrid.h \
         wx/xrc/xh_all.h \
@@ -3048,6 +3221,7 @@ 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_collpane.h \
         wx/xrc/xh_combo.h \
         wx/xrc/xh_datectrl.h \
         wx/xrc/xh_dirpicker.h \
         wx/xrc/xh_combo.h \
         wx/xrc/xh_datectrl.h \
         wx/xrc/xh_dirpicker.h \
@@ -3098,17 +3272,21 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
         wx/aui/aui.h \
         wx/richtext/richtextctrl.h \
         wx/richtext/richtextbuffer.h \
         wx/aui/aui.h \
         wx/richtext/richtextctrl.h \
         wx/richtext/richtextbuffer.h \
+       wx/richtext/richtexthtml.h \
         wx/richtext/richtextstyles.h \
         wx/richtext/richtextxml.h \
         wx/richtext/richtextformatdlg.h \
         wx/richtext/richtextsymboldlg.h \
         wx/richtext/richtextstyledlg.h \
         wx/richtext/richtextstyles.h \
         wx/richtext/richtextxml.h \
         wx/richtext/richtextformatdlg.h \
         wx/richtext/richtextsymboldlg.h \
         wx/richtext/richtextstyledlg.h \
-       wx/richtext/richtextprint.h
+       wx/richtext/richtextprint.h \
+       wx/stc/stc.h
  @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_MONOLITHIC_1_SHARED_1@__monodll___depname = $(COND_MONOLITHIC_1_SHARED_1___monodll___depname)
  @COND_MONOLITHIC_1_SHARED_1@__install_monodll___depname = install_monodll
  @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_MONOLITHIC_1_SHARED_1@__monodll___depname = $(COND_MONOLITHIC_1_SHARED_1___monodll___depname)
  @COND_MONOLITHIC_1_SHARED_1@__install_monodll___depname = install_monodll
+@COND_MONOLITHIC_1_SHARED_1@__uninstall_monodll___depname \
+@COND_MONOLITHIC_1_SHARED_1@   = uninstall_monodll
  COND_PLATFORM_MACOSX_1___monodll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__monodll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___monodll___macinstnamecmd)
  COND_PLATFORM_MACOSX_1___monodll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__monodll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___monodll___macinstnamecmd)
@@ -3116,7 +3294,7 @@ COND_PLATFORM_OS2_1___monodll___importlib = -import \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__monodll___importlib = $(COND_PLATFORM_OS2_1___monodll___importlib)
  COND_WINDOWS_IMPLIB_1___monodll___importlib = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__monodll___importlib = $(COND_PLATFORM_OS2_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)
+       -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_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 \
@@ -3149,7 +3327,10 @@ COND_USE_SOSYMLINKS_1___monodll___so_symlinks_inst_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)
  @COND_USE_SOSYMLINKS_1@__monodll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___monodll___so_symlinks_inst_cmd)
         $(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_PLATFORM_WIN32_1@__monodll___win32rc = monodll_version_rc.o
+COND_USE_SOSYMLINKS_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)
+@COND_USE_SOSYMLINKS_1@__monodll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___monodll___so_symlinks_uninst_cmd)
  @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS \
  @COND_PLATFORM_MACOSX_1@       = $(__BASE_MACOSX_SRC_OBJECTS)
  COND_PLATFORM_MACOS_1___BASE_PLATFORM_SRC_OBJECTS =  \
  @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS \
  @COND_PLATFORM_MACOSX_1@       = $(__BASE_MACOSX_SRC_OBJECTS)
  COND_PLATFORM_MACOS_1___BASE_PLATFORM_SRC_OBJECTS =  \
@@ -3263,6 +3444,7 @@ COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS =  \
         monodll_utilsexc_base.o \
         monodll_baseunix.o \
         monodll_dlunix.o \
         monodll_utilsexc_base.o \
         monodll_baseunix.o \
         monodll_dlunix.o \
+       monodll_snglinst.o \
         monodll_stdpaths.o
  @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS)
  COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS =  \
         monodll_stdpaths.o
  @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS)
  COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS =  \
@@ -3353,6 +3535,7 @@ 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_collpane.o \
         monodll_xh_combo.o \
         monodll_xh_datectrl.o \
         monodll_xh_dirpicker.o \
         monodll_xh_combo.o \
         monodll_xh_datectrl.o \
         monodll_xh_dirpicker.o \
@@ -3409,7 +3592,10 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS =  \
         monodll_richtextformatdlg.o \
         monodll_richtextsymboldlg.o \
         monodll_richtextstyledlg.o \
         monodll_richtextformatdlg.o \
         monodll_richtextsymboldlg.o \
         monodll_richtextstyledlg.o \
-       monodll_richtextprint.o
+       monodll_richtextprint.o \
+       monodll_stc.o \
+       monodll_PlatWX.o \
+       monodll_ScintillaWX.o
  @COND_USE_GUI_1@__MONOLIB_GUI_SRC_OBJECTS = $(COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS)
  COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
         $(__LOWLEVEL_SRC_OBJECTS) \
  @COND_USE_GUI_1@__MONOLIB_GUI_SRC_OBJECTS = $(COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS)
  COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
         $(__LOWLEVEL_SRC_OBJECTS) \
@@ -3421,6 +3607,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
         monodll_artstd.o \
         monodll_bmpbase.o \
         monodll_bookctrl.o \
         monodll_artstd.o \
         monodll_bmpbase.o \
         monodll_bookctrl.o \
+       monodll_btncmn.o \
         monodll_choiccmn.o \
         monodll_clipcmn.o \
         monodll_clrpickercmn.o \
         monodll_choiccmn.o \
         monodll_clipcmn.o \
         monodll_clrpickercmn.o \
@@ -3436,6 +3623,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
         monodll_dcbase.o \
         monodll_dcbufcmn.o \
         monodll_dcgraph.o \
         monodll_dcbase.o \
         monodll_dcbufcmn.o \
         monodll_dcgraph.o \
+       monodll_dcsvg.o \
         monodll_dlgcmn.o \
         monodll_dndcmn.o \
         monodll_dobjcmn.o \
         monodll_dlgcmn.o \
         monodll_dndcmn.o \
         monodll_dobjcmn.o \
@@ -3452,6 +3640,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
         monodll_fontcmn.o \
         monodll_fontenumcmn.o \
         monodll_fontmap.o \
         monodll_fontcmn.o \
         monodll_fontenumcmn.o \
         monodll_fontmap.o \
+       monodll_fontutilcmn.o \
         monodll_framecmn.o \
         monodll_gaugecmn.o \
         monodll_gbsizer.o \
         monodll_framecmn.o \
         monodll_gaugecmn.o \
         monodll_gbsizer.o \
@@ -3471,6 +3660,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
         monodll_imagpcx.o \
         monodll_imagpng.o \
         monodll_imagpnm.o \
         monodll_imagpcx.o \
         monodll_imagpng.o \
         monodll_imagpnm.o \
+       monodll_imagtga.o \
         monodll_imagtiff.o \
         monodll_imagxpm.o \
         monodll_layout.o \
         monodll_imagtiff.o \
         monodll_imagxpm.o \
         monodll_layout.o \
@@ -3490,7 +3680,9 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
         monodll_rgncmn.o \
         monodll_settcmn.o \
         monodll_sizer.o \
         monodll_rgncmn.o \
         monodll_settcmn.o \
         monodll_sizer.o \
+       monodll_srchcmn.o \
         monodll_statbar.o \
         monodll_statbar.o \
+       monodll_stattextcmn.o \
         monodll_stockitem.o \
         monodll_tbarbase.o \
         monodll_textcmn.o \
         monodll_stockitem.o \
         monodll_tbarbase.o \
         monodll_textcmn.o \
@@ -3507,6 +3699,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
         monodll_choicdgg.o \
         monodll_choicbkg.o \
         monodll_clrpickerg.o \
         monodll_choicdgg.o \
         monodll_choicbkg.o \
         monodll_clrpickerg.o \
+       monodll_collpaneg.o \
         monodll_combog.o \
         monodll_dcpsg.o \
         monodll_dirctrlg.o \
         monodll_combog.o \
         monodll_dcpsg.o \
         monodll_dirctrlg.o \
@@ -3524,6 +3717,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
         monodll_selstore.o \
         monodll_spinctlg.o \
         monodll_splitter.o \
         monodll_selstore.o \
         monodll_spinctlg.o \
         monodll_splitter.o \
+       monodll_srchctlg.o \
         monodll_textdlgg.o \
         monodll_tipwin.o \
         monodll_toolbkg.o \
         monodll_textdlgg.o \
         monodll_tipwin.o \
         monodll_toolbkg.o \
@@ -3592,6 +3786,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
         monodll_artstd.o \
         monodll_bmpbase.o \
         monodll_bookctrl.o \
         monodll_artstd.o \
         monodll_bmpbase.o \
         monodll_bookctrl.o \
+       monodll_btncmn.o \
         monodll_choiccmn.o \
         monodll_clipcmn.o \
         monodll_clrpickercmn.o \
         monodll_choiccmn.o \
         monodll_clipcmn.o \
         monodll_clrpickercmn.o \
@@ -3607,6 +3802,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
         monodll_dcbase.o \
         monodll_dcbufcmn.o \
         monodll_dcgraph.o \
         monodll_dcbase.o \
         monodll_dcbufcmn.o \
         monodll_dcgraph.o \
+       monodll_dcsvg.o \
         monodll_dlgcmn.o \
         monodll_dndcmn.o \
         monodll_dobjcmn.o \
         monodll_dlgcmn.o \
         monodll_dndcmn.o \
         monodll_dobjcmn.o \
@@ -3623,6 +3819,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
         monodll_fontcmn.o \
         monodll_fontenumcmn.o \
         monodll_fontmap.o \
         monodll_fontcmn.o \
         monodll_fontenumcmn.o \
         monodll_fontmap.o \
+       monodll_fontutilcmn.o \
         monodll_framecmn.o \
         monodll_gaugecmn.o \
         monodll_gbsizer.o \
         monodll_framecmn.o \
         monodll_gaugecmn.o \
         monodll_gbsizer.o \
@@ -3642,6 +3839,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
         monodll_imagpcx.o \
         monodll_imagpng.o \
         monodll_imagpnm.o \
         monodll_imagpcx.o \
         monodll_imagpng.o \
         monodll_imagpnm.o \
+       monodll_imagtga.o \
         monodll_imagtiff.o \
         monodll_imagxpm.o \
         monodll_layout.o \
         monodll_imagtiff.o \
         monodll_imagxpm.o \
         monodll_layout.o \
@@ -3661,7 +3859,9 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
         monodll_rgncmn.o \
         monodll_settcmn.o \
         monodll_sizer.o \
         monodll_rgncmn.o \
         monodll_settcmn.o \
         monodll_sizer.o \
+       monodll_srchcmn.o \
         monodll_statbar.o \
         monodll_statbar.o \
+       monodll_stattextcmn.o \
         monodll_stockitem.o \
         monodll_tbarbase.o \
         monodll_textcmn.o \
         monodll_stockitem.o \
         monodll_tbarbase.o \
         monodll_textcmn.o \
@@ -3678,6 +3878,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
         monodll_choicdgg.o \
         monodll_choicbkg.o \
         monodll_clrpickerg.o \
         monodll_choicdgg.o \
         monodll_choicbkg.o \
         monodll_clrpickerg.o \
+       monodll_collpaneg.o \
         monodll_combog.o \
         monodll_dcpsg.o \
         monodll_dirctrlg.o \
         monodll_combog.o \
         monodll_dcpsg.o \
         monodll_dirctrlg.o \
@@ -3695,6 +3896,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
         monodll_selstore.o \
         monodll_spinctlg.o \
         monodll_splitter.o \
         monodll_selstore.o \
         monodll_spinctlg.o \
         monodll_splitter.o \
+       monodll_srchctlg.o \
         monodll_textdlgg.o \
         monodll_tipwin.o \
         monodll_toolbkg.o \
         monodll_textdlgg.o \
         monodll_tipwin.o \
         monodll_toolbkg.o \
@@ -3706,6 +3908,9 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
  @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS = \
  @COND_TOOLKIT_COCOA@   monodll_gsockosx.o monodll_hid.o monodll_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS =  \
  @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS = \
  @COND_TOOLKIT_COCOA@   monodll_gsockosx.o monodll_hid.o monodll_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS =  \
+       monodll_fontmgrcmn.o \
+       monodll_gsocketiohandler.o \
+       monodll_selectdispatcher.o \
         monodll_caret.o \
         monodll_colour.o \
         monodll_icon.o \
         monodll_caret.o \
         monodll_colour.o \
         monodll_icon.o \
@@ -3723,6 +3928,8 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS =  \
         monodll_evtloop.o \
         monodll_font.o \
         monodll_fontenum.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_overlay.o \
         monodll_pen.o \
         monodll_region.o \
@@ -3783,6 +3990,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS =  \
         monodll_icon.o \
         monodll_paletteg.o \
         monodll_app.o \
         monodll_icon.o \
         monodll_paletteg.o \
         monodll_app.o \
+       monodll_assertdlg_gtk.o \
         monodll_bitmap.o \
         monodll_brush.o \
         monodll_clipbrd.o \
         monodll_bitmap.o \
         monodll_brush.o \
         monodll_clipbrd.o \
@@ -3798,7 +4006,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS =  \
         monodll_evtloop.o \
         monodll_font.o \
         monodll_gsockgtk.o \
         monodll_evtloop.o \
         monodll_font.o \
         monodll_gsockgtk.o \
-       monodll_main.o \
         monodll_minifram.o \
         monodll_pen.o \
         monodll_popupwin.o \
         monodll_minifram.o \
         monodll_pen.o \
         monodll_popupwin.o \
@@ -3814,6 +4021,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS =  \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS)
  @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS = $(__MAC_LOWLEVEL_SRC_OBJECTS)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS =  \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS)
  @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS = $(__MAC_LOWLEVEL_SRC_OBJECTS)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS =  \
+       monodll_fontmgrcmn.o \
         monodll_caret.o \
         monodll_colour.o \
         monodll_icon.o \
         monodll_caret.o \
         monodll_colour.o \
         monodll_icon.o \
@@ -3834,6 +4042,7 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS =  \
         monodll_evtloop.o \
         monodll_font.o \
         monodll_fontenum.o \
         monodll_evtloop.o \
         monodll_font.o \
         monodll_fontenum.o \
+       monodll_fontmgr.o \
         monodll_fontutil.o \
         monodll_palette.o \
         monodll_pen.o \
         monodll_fontutil.o \
         monodll_palette.o \
         monodll_pen.o \
@@ -3881,6 +4090,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS =  \
         monodll_fontutil.o \
         monodll_gdiimage.o \
         monodll_gdiobj.o \
         monodll_fontutil.o \
         monodll_gdiimage.o \
         monodll_gdiobj.o \
+       monodll_gdiplus.o \
         monodll_graphics.o \
         monodll_gsockmsw.o \
         monodll_icon.o \
         monodll_graphics.o \
         monodll_gsockmsw.o \
         monodll_icon.o \
@@ -3934,6 +4144,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS =  \
         monodll_fontutil.o \
         monodll_gdiimage.o \
         monodll_gdiobj.o \
         monodll_fontutil.o \
         monodll_gdiimage.o \
         monodll_gdiobj.o \
+       monodll_gdiplus.o \
         monodll_graphics.o \
         monodll_gsockmsw.o \
         monodll_icon.o \
         monodll_graphics.o \
         monodll_gsockmsw.o \
         monodll_icon.o \
@@ -3966,6 +4177,8 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS =  \
         monodll_fontutil.o \
         monodll_utilsx11.o \
         monodll_displayx11.o \
         monodll_fontutil.o \
         monodll_utilsx11.o \
         monodll_displayx11.o \
+       monodll_gsocketiohandler.o \
+       monodll_selectdispatcher.o \
         monodll_icon.o \
         monodll_timer.o \
         monodll_app.o \
         monodll_icon.o \
         monodll_timer.o \
         monodll_app.o \
@@ -3982,7 +4195,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS =  \
         monodll_dcscreen.o \
         monodll_evtloop.o \
         monodll_font.o \
         monodll_dcscreen.o \
         monodll_evtloop.o \
         monodll_font.o \
-       monodll_gsockx11.o \
         monodll_minifram.o \
         monodll_nanox.o \
         monodll_palette.o \
         monodll_minifram.o \
         monodll_nanox.o \
         monodll_palette.o \
@@ -4147,6 +4359,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS =  \
         monodll_checkbox.o \
         monodll_checklst.o \
         monodll_choice.o \
         monodll_checkbox.o \
         monodll_checklst.o \
         monodll_choice.o \
+       monodll_collpane.o \
         monodll_colordlg.o \
         monodll_combobox.o \
         monodll_control.o \
         monodll_colordlg.o \
         monodll_combobox.o \
         monodll_control.o \
@@ -4187,6 +4400,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS =  \
         monodll_accel.o \
         monodll_aga.o \
         monodll_app.o \
         monodll_accel.o \
         monodll_aga.o \
         monodll_app.o \
+       monodll_artmac.o \
         monodll_bitmap.o \
         monodll_bmpbuttn.o \
         monodll_brush.o \
         monodll_bitmap.o \
         monodll_bmpbuttn.o \
         monodll_brush.o \
@@ -4247,6 +4461,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS =  \
         monodll_slider.o \
         monodll_spinbutt.o \
         monodll_spinctrl.o \
         monodll_slider.o \
         monodll_spinbutt.o \
         monodll_spinctrl.o \
+       monodll_srchctrl.o \
         monodll_statbmp.o \
         monodll_statbox.o \
         monodll_statbrma.o \
         monodll_statbmp.o \
         monodll_statbox.o \
         monodll_statbrma.o \
@@ -4525,15 +4740,15 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS =  \
         monodll_tbarwce.o \
         monodll_textctrlce.o
  @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS)
         monodll_tbarwce.o \
         monodll_textctrlce.o
  @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS)
-COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS =  \
-       monodll_snglinst.o \
-       monodll_webkit.o \
-       monodll_fontdlgosx.o \
-       monodll_colordlgosx.o
-@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS = $(COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS)
+@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS = \
+@COND_PLATFORM_MACOSX_1@       monodll_webkit.o monodll_fontdlgosx.o \
+@COND_PLATFORM_MACOSX_1@       monodll_colordlgosx.o
  @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \
  @COND_TOOLKIT_COCOA@   monodll_gsockosx.o monodll_hid.o monodll_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1 =  \
  @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \
  @COND_TOOLKIT_COCOA@   monodll_gsockosx.o monodll_hid.o monodll_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1 =  \
+       monodll_fontmgrcmn.o \
+       monodll_gsocketiohandler.o \
+       monodll_selectdispatcher.o \
         monodll_caret.o \
         monodll_colour.o \
         monodll_icon.o \
         monodll_caret.o \
         monodll_colour.o \
         monodll_icon.o \
@@ -4551,6 +4766,8 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1 =  \
         monodll_evtloop.o \
         monodll_font.o \
         monodll_fontenum.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_overlay.o \
         monodll_pen.o \
         monodll_region.o \
@@ -4611,6 +4828,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1 =  \
         monodll_icon.o \
         monodll_paletteg.o \
         monodll_app.o \
         monodll_icon.o \
         monodll_paletteg.o \
         monodll_app.o \
+       monodll_assertdlg_gtk.o \
         monodll_bitmap.o \
         monodll_brush.o \
         monodll_clipbrd.o \
         monodll_bitmap.o \
         monodll_brush.o \
         monodll_clipbrd.o \
@@ -4626,7 +4844,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1 =  \
         monodll_evtloop.o \
         monodll_font.o \
         monodll_gsockgtk.o \
         monodll_evtloop.o \
         monodll_font.o \
         monodll_gsockgtk.o \
-       monodll_main.o \
         monodll_minifram.o \
         monodll_pen.o \
         monodll_popupwin.o \
         monodll_minifram.o \
         monodll_pen.o \
         monodll_popupwin.o \
@@ -4642,6 +4859,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1 =  \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1)
  @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_1 = $(__MAC_LOWLEVEL_SRC_OBJECTS)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_1 =  \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1)
  @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_1 = $(__MAC_LOWLEVEL_SRC_OBJECTS)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_1 =  \
+       monodll_fontmgrcmn.o \
         monodll_caret.o \
         monodll_colour.o \
         monodll_icon.o \
         monodll_caret.o \
         monodll_colour.o \
         monodll_icon.o \
@@ -4662,6 +4880,7 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_1 =  \
         monodll_evtloop.o \
         monodll_font.o \
         monodll_fontenum.o \
         monodll_evtloop.o \
         monodll_font.o \
         monodll_fontenum.o \
+       monodll_fontmgr.o \
         monodll_fontutil.o \
         monodll_palette.o \
         monodll_pen.o \
         monodll_fontutil.o \
         monodll_palette.o \
         monodll_pen.o \
@@ -4709,6 +4928,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 =  \
         monodll_fontutil.o \
         monodll_gdiimage.o \
         monodll_gdiobj.o \
         monodll_fontutil.o \
         monodll_gdiimage.o \
         monodll_gdiobj.o \
+       monodll_gdiplus.o \
         monodll_graphics.o \
         monodll_gsockmsw.o \
         monodll_icon.o \
         monodll_graphics.o \
         monodll_gsockmsw.o \
         monodll_icon.o \
@@ -4762,6 +4982,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_1 =  \
         monodll_fontutil.o \
         monodll_gdiimage.o \
         monodll_gdiobj.o \
         monodll_fontutil.o \
         monodll_gdiimage.o \
         monodll_gdiobj.o \
+       monodll_gdiplus.o \
         monodll_graphics.o \
         monodll_gsockmsw.o \
         monodll_icon.o \
         monodll_graphics.o \
         monodll_gsockmsw.o \
         monodll_icon.o \
@@ -4794,6 +5015,8 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 =  \
         monodll_fontutil.o \
         monodll_utilsx11.o \
         monodll_displayx11.o \
         monodll_fontutil.o \
         monodll_utilsx11.o \
         monodll_displayx11.o \
+       monodll_gsocketiohandler.o \
+       monodll_selectdispatcher.o \
         monodll_icon.o \
         monodll_timer.o \
         monodll_app.o \
         monodll_icon.o \
         monodll_timer.o \
         monodll_app.o \
@@ -4810,7 +5033,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 =  \
         monodll_dcscreen.o \
         monodll_evtloop.o \
         monodll_font.o \
         monodll_dcscreen.o \
         monodll_evtloop.o \
         monodll_font.o \
-       monodll_gsockx11.o \
         monodll_minifram.o \
         monodll_nanox.o \
         monodll_palette.o \
         monodll_minifram.o \
         monodll_nanox.o \
         monodll_palette.o \
@@ -4827,17 +5049,18 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 =  \
  COND_WXUNIV_0___ADVANCED_SRC_OBJECTS =  \
         monodll_animatecmn.o \
         monodll_datavcmn.o \
  COND_WXUNIV_0___ADVANCED_SRC_OBJECTS =  \
         monodll_animatecmn.o \
         monodll_datavcmn.o \
+       monodll_hyperlnkcmn.o \
         monodll_aboutdlgg.o \
         monodll_aboutdlgg.o \
+       monodll_animateg.o \
         monodll_bmpcboxg.o \
         monodll_calctrl.o \
         monodll_bmpcboxg.o \
         monodll_calctrl.o \
-       monodll_collpaneg.o \
         monodll_datavgen.o \
         monodll_datectlg.o \
         monodll_grid.o \
         monodll_gridctrl.o \
         monodll_gridsel.o \
         monodll_helpext.o \
         monodll_datavgen.o \
         monodll_datectlg.o \
         monodll_grid.o \
         monodll_gridctrl.o \
         monodll_gridsel.o \
         monodll_helpext.o \
-       monodll_hyperlink.o \
+       monodll_hyperlinkg.o \
         monodll_laywin.o \
         monodll_odcombo.o \
         monodll_propdlg.o \
         monodll_laywin.o \
         monodll_odcombo.o \
         monodll_propdlg.o \
@@ -4851,17 +5074,18 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS =  \
  COND_WXUNIV_1___ADVANCED_SRC_OBJECTS =  \
         monodll_animatecmn.o \
         monodll_datavcmn.o \
  COND_WXUNIV_1___ADVANCED_SRC_OBJECTS =  \
         monodll_animatecmn.o \
         monodll_datavcmn.o \
+       monodll_hyperlnkcmn.o \
         monodll_aboutdlgg.o \
         monodll_aboutdlgg.o \
+       monodll_animateg.o \
         monodll_bmpcboxg.o \
         monodll_calctrl.o \
         monodll_bmpcboxg.o \
         monodll_calctrl.o \
-       monodll_collpaneg.o \
         monodll_datavgen.o \
         monodll_datectlg.o \
         monodll_grid.o \
         monodll_gridctrl.o \
         monodll_gridsel.o \
         monodll_helpext.o \
         monodll_datavgen.o \
         monodll_datectlg.o \
         monodll_grid.o \
         monodll_gridctrl.o \
         monodll_gridsel.o \
         monodll_helpext.o \
-       monodll_hyperlink.o \
+       monodll_hyperlinkg.o \
         monodll_laywin.o \
         monodll_odcombo.o \
         monodll_propdlg.o \
         monodll_laywin.o \
         monodll_odcombo.o \
         monodll_propdlg.o \
@@ -4879,23 +5103,32 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS =  \
  @COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_mediactrl.o 
  @COND_TOOLKIT_MAC@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_mediactrl.o
  @COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_mediactrl.o
  @COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_mediactrl.o 
  @COND_TOOLKIT_MAC@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_mediactrl.o
  @COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_mediactrl.o
-@COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS = \
-@COND_TOOLKIT_MSW@     monodll_mediactrl_am.o monodll_mediactrl_wmp10.o \
-@COND_TOOLKIT_MSW@     monodll_activex.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_PM@__MEDIA_PLATFORM_SRC_OBJECTS = 
  @COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS = 
-@COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS = \
-@COND_TOOLKIT_WINCE@   monodll_mediactrl_am.o monodll_mediactrl_wmp10.o \
-@COND_TOOLKIT_WINCE@   monodll_activex.o
+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_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o
  @COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o
  @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS = monodll_helpbest.o
  @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS \
  @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@   = monodll_sound_sdl.o
  @COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS = monodll_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_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_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___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_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
@@ -5015,6 +5248,7 @@ COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1 =  \
         monolib_utilsexc_base.o \
         monolib_baseunix.o \
         monolib_dlunix.o \
         monolib_utilsexc_base.o \
         monolib_baseunix.o \
         monolib_dlunix.o \
+       monolib_snglinst.o \
         monolib_stdpaths.o
  @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1)
  COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_1 =  \
         monolib_stdpaths.o
  @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1)
  COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_1 =  \
@@ -5105,6 +5339,7 @@ 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_collpane.o \
         monolib_xh_combo.o \
         monolib_xh_datectrl.o \
         monolib_xh_dirpicker.o \
         monolib_xh_combo.o \
         monolib_xh_datectrl.o \
         monolib_xh_dirpicker.o \
@@ -5161,7 +5396,10 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
         monolib_richtextformatdlg.o \
         monolib_richtextsymboldlg.o \
         monolib_richtextstyledlg.o \
         monolib_richtextformatdlg.o \
         monolib_richtextsymboldlg.o \
         monolib_richtextstyledlg.o \
-       monolib_richtextprint.o
+       monolib_richtextprint.o \
+       monolib_stc.o \
+       monolib_PlatWX.o \
+       monolib_ScintillaWX.o
  @COND_USE_GUI_1@__MONOLIB_GUI_SRC_OBJECTS_1 = $(COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1)
  COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
         $(__LOWLEVEL_SRC_OBJECTS_2) \
  @COND_USE_GUI_1@__MONOLIB_GUI_SRC_OBJECTS_1 = $(COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1)
  COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
         $(__LOWLEVEL_SRC_OBJECTS_2) \
@@ -5173,6 +5411,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
         monolib_artstd.o \
         monolib_bmpbase.o \
         monolib_bookctrl.o \
         monolib_artstd.o \
         monolib_bmpbase.o \
         monolib_bookctrl.o \
+       monolib_btncmn.o \
         monolib_choiccmn.o \
         monolib_clipcmn.o \
         monolib_clrpickercmn.o \
         monolib_choiccmn.o \
         monolib_clipcmn.o \
         monolib_clrpickercmn.o \
@@ -5188,6 +5427,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
         monolib_dcbase.o \
         monolib_dcbufcmn.o \
         monolib_dcgraph.o \
         monolib_dcbase.o \
         monolib_dcbufcmn.o \
         monolib_dcgraph.o \
+       monolib_dcsvg.o \
         monolib_dlgcmn.o \
         monolib_dndcmn.o \
         monolib_dobjcmn.o \
         monolib_dlgcmn.o \
         monolib_dndcmn.o \
         monolib_dobjcmn.o \
@@ -5204,6 +5444,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
         monolib_fontcmn.o \
         monolib_fontenumcmn.o \
         monolib_fontmap.o \
         monolib_fontcmn.o \
         monolib_fontenumcmn.o \
         monolib_fontmap.o \
+       monolib_fontutilcmn.o \
         monolib_framecmn.o \
         monolib_gaugecmn.o \
         monolib_gbsizer.o \
         monolib_framecmn.o \
         monolib_gaugecmn.o \
         monolib_gbsizer.o \
@@ -5223,6 +5464,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
         monolib_imagpcx.o \
         monolib_imagpng.o \
         monolib_imagpnm.o \
         monolib_imagpcx.o \
         monolib_imagpng.o \
         monolib_imagpnm.o \
+       monolib_imagtga.o \
         monolib_imagtiff.o \
         monolib_imagxpm.o \
         monolib_layout.o \
         monolib_imagtiff.o \
         monolib_imagxpm.o \
         monolib_layout.o \
@@ -5242,7 +5484,9 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
         monolib_rgncmn.o \
         monolib_settcmn.o \
         monolib_sizer.o \
         monolib_rgncmn.o \
         monolib_settcmn.o \
         monolib_sizer.o \
+       monolib_srchcmn.o \
         monolib_statbar.o \
         monolib_statbar.o \
+       monolib_stattextcmn.o \
         monolib_stockitem.o \
         monolib_tbarbase.o \
         monolib_textcmn.o \
         monolib_stockitem.o \
         monolib_tbarbase.o \
         monolib_textcmn.o \
@@ -5259,6 +5503,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
         monolib_choicdgg.o \
         monolib_choicbkg.o \
         monolib_clrpickerg.o \
         monolib_choicdgg.o \
         monolib_choicbkg.o \
         monolib_clrpickerg.o \
+       monolib_collpaneg.o \
         monolib_combog.o \
         monolib_dcpsg.o \
         monolib_dirctrlg.o \
         monolib_combog.o \
         monolib_dcpsg.o \
         monolib_dirctrlg.o \
@@ -5276,6 +5521,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
         monolib_selstore.o \
         monolib_spinctlg.o \
         monolib_splitter.o \
         monolib_selstore.o \
         monolib_spinctlg.o \
         monolib_splitter.o \
+       monolib_srchctlg.o \
         monolib_textdlgg.o \
         monolib_tipwin.o \
         monolib_toolbkg.o \
         monolib_textdlgg.o \
         monolib_tipwin.o \
         monolib_toolbkg.o \
@@ -5344,6 +5590,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
         monolib_artstd.o \
         monolib_bmpbase.o \
         monolib_bookctrl.o \
         monolib_artstd.o \
         monolib_bmpbase.o \
         monolib_bookctrl.o \
+       monolib_btncmn.o \
         monolib_choiccmn.o \
         monolib_clipcmn.o \
         monolib_clrpickercmn.o \
         monolib_choiccmn.o \
         monolib_clipcmn.o \
         monolib_clrpickercmn.o \
@@ -5359,6 +5606,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
         monolib_dcbase.o \
         monolib_dcbufcmn.o \
         monolib_dcgraph.o \
         monolib_dcbase.o \
         monolib_dcbufcmn.o \
         monolib_dcgraph.o \
+       monolib_dcsvg.o \
         monolib_dlgcmn.o \
         monolib_dndcmn.o \
         monolib_dobjcmn.o \
         monolib_dlgcmn.o \
         monolib_dndcmn.o \
         monolib_dobjcmn.o \
@@ -5375,6 +5623,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
         monolib_fontcmn.o \
         monolib_fontenumcmn.o \
         monolib_fontmap.o \
         monolib_fontcmn.o \
         monolib_fontenumcmn.o \
         monolib_fontmap.o \
+       monolib_fontutilcmn.o \
         monolib_framecmn.o \
         monolib_gaugecmn.o \
         monolib_gbsizer.o \
         monolib_framecmn.o \
         monolib_gaugecmn.o \
         monolib_gbsizer.o \
@@ -5394,6 +5643,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
         monolib_imagpcx.o \
         monolib_imagpng.o \
         monolib_imagpnm.o \
         monolib_imagpcx.o \
         monolib_imagpng.o \
         monolib_imagpnm.o \
+       monolib_imagtga.o \
         monolib_imagtiff.o \
         monolib_imagxpm.o \
         monolib_layout.o \
         monolib_imagtiff.o \
         monolib_imagxpm.o \
         monolib_layout.o \
@@ -5413,7 +5663,9 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
         monolib_rgncmn.o \
         monolib_settcmn.o \
         monolib_sizer.o \
         monolib_rgncmn.o \
         monolib_settcmn.o \
         monolib_sizer.o \
+       monolib_srchcmn.o \
         monolib_statbar.o \
         monolib_statbar.o \
+       monolib_stattextcmn.o \
         monolib_stockitem.o \
         monolib_tbarbase.o \
         monolib_textcmn.o \
         monolib_stockitem.o \
         monolib_tbarbase.o \
         monolib_textcmn.o \
@@ -5430,6 +5682,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
         monolib_choicdgg.o \
         monolib_choicbkg.o \
         monolib_clrpickerg.o \
         monolib_choicdgg.o \
         monolib_choicbkg.o \
         monolib_clrpickerg.o \
+       monolib_collpaneg.o \
         monolib_combog.o \
         monolib_dcpsg.o \
         monolib_dirctrlg.o \
         monolib_combog.o \
         monolib_dcpsg.o \
         monolib_dirctrlg.o \
@@ -5447,6 +5700,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
         monolib_selstore.o \
         monolib_spinctlg.o \
         monolib_splitter.o \
         monolib_selstore.o \
         monolib_spinctlg.o \
         monolib_splitter.o \
+       monolib_srchctlg.o \
         monolib_textdlgg.o \
         monolib_tipwin.o \
         monolib_toolbkg.o \
         monolib_textdlgg.o \
         monolib_tipwin.o \
         monolib_toolbkg.o \
@@ -5458,6 +5712,9 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
  @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_2 = \
  @COND_TOOLKIT_COCOA@   monolib_gsockosx.o monolib_hid.o monolib_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_2 =  \
  @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_2 = \
  @COND_TOOLKIT_COCOA@   monolib_gsockosx.o monolib_hid.o monolib_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_2 =  \
+       monolib_fontmgrcmn.o \
+       monolib_gsocketiohandler.o \
+       monolib_selectdispatcher.o \
         monolib_caret.o \
         monolib_colour.o \
         monolib_icon.o \
         monolib_caret.o \
         monolib_colour.o \
         monolib_icon.o \
@@ -5475,6 +5732,8 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_2 =  \
         monolib_evtloop.o \
         monolib_font.o \
         monolib_fontenum.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_overlay.o \
         monolib_pen.o \
         monolib_region.o \
@@ -5535,6 +5794,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_2 =  \
         monolib_icon.o \
         monolib_paletteg.o \
         monolib_app.o \
         monolib_icon.o \
         monolib_paletteg.o \
         monolib_app.o \
+       monolib_assertdlg_gtk.o \
         monolib_bitmap.o \
         monolib_brush.o \
         monolib_clipbrd.o \
         monolib_bitmap.o \
         monolib_brush.o \
         monolib_clipbrd.o \
@@ -5550,7 +5810,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_2 =  \
         monolib_evtloop.o \
         monolib_font.o \
         monolib_gsockgtk.o \
         monolib_evtloop.o \
         monolib_font.o \
         monolib_gsockgtk.o \
-       monolib_main.o \
         monolib_minifram.o \
         monolib_pen.o \
         monolib_popupwin.o \
         monolib_minifram.o \
         monolib_pen.o \
         monolib_popupwin.o \
@@ -5567,6 +5826,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_2 =  \
  @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_2 = \
  @COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_0)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_2 =  \
  @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_2 = \
  @COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_0)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_2 =  \
+       monolib_fontmgrcmn.o \
         monolib_caret.o \
         monolib_colour.o \
         monolib_icon.o \
         monolib_caret.o \
         monolib_colour.o \
         monolib_icon.o \
@@ -5587,6 +5847,7 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_2 =  \
         monolib_evtloop.o \
         monolib_font.o \
         monolib_fontenum.o \
         monolib_evtloop.o \
         monolib_font.o \
         monolib_fontenum.o \
+       monolib_fontmgr.o \
         monolib_fontutil.o \
         monolib_palette.o \
         monolib_pen.o \
         monolib_fontutil.o \
         monolib_palette.o \
         monolib_pen.o \
@@ -5634,6 +5895,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 =  \
         monolib_fontutil.o \
         monolib_gdiimage.o \
         monolib_gdiobj.o \
         monolib_fontutil.o \
         monolib_gdiimage.o \
         monolib_gdiobj.o \
+       monolib_gdiplus.o \
         monolib_graphics.o \
         monolib_gsockmsw.o \
         monolib_icon.o \
         monolib_graphics.o \
         monolib_gsockmsw.o \
         monolib_icon.o \
@@ -5687,6 +5949,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_2 =  \
         monolib_fontutil.o \
         monolib_gdiimage.o \
         monolib_gdiobj.o \
         monolib_fontutil.o \
         monolib_gdiimage.o \
         monolib_gdiobj.o \
+       monolib_gdiplus.o \
         monolib_graphics.o \
         monolib_gsockmsw.o \
         monolib_icon.o \
         monolib_graphics.o \
         monolib_gsockmsw.o \
         monolib_icon.o \
@@ -5719,6 +5982,8 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_2 =  \
         monolib_fontutil.o \
         monolib_utilsx11.o \
         monolib_displayx11.o \
         monolib_fontutil.o \
         monolib_utilsx11.o \
         monolib_displayx11.o \
+       monolib_gsocketiohandler.o \
+       monolib_selectdispatcher.o \
         monolib_icon.o \
         monolib_timer.o \
         monolib_app.o \
         monolib_icon.o \
         monolib_timer.o \
         monolib_app.o \
@@ -5735,7 +6000,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_2 =  \
         monolib_dcscreen.o \
         monolib_evtloop.o \
         monolib_font.o \
         monolib_dcscreen.o \
         monolib_evtloop.o \
         monolib_font.o \
-       monolib_gsockx11.o \
         monolib_minifram.o \
         monolib_nanox.o \
         monolib_palette.o \
         monolib_minifram.o \
         monolib_nanox.o \
         monolib_palette.o \
@@ -5900,6 +6164,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1 =  \
         monolib_checkbox.o \
         monolib_checklst.o \
         monolib_choice.o \
         monolib_checkbox.o \
         monolib_checklst.o \
         monolib_choice.o \
+       monolib_collpane.o \
         monolib_colordlg.o \
         monolib_combobox.o \
         monolib_control.o \
         monolib_colordlg.o \
         monolib_combobox.o \
         monolib_control.o \
@@ -5940,6 +6205,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1 =  \
         monolib_accel.o \
         monolib_aga.o \
         monolib_app.o \
         monolib_accel.o \
         monolib_aga.o \
         monolib_app.o \
+       monolib_artmac.o \
         monolib_bitmap.o \
         monolib_bmpbuttn.o \
         monolib_brush.o \
         monolib_bitmap.o \
         monolib_bmpbuttn.o \
         monolib_brush.o \
@@ -6000,6 +6266,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1 =  \
         monolib_slider.o \
         monolib_spinbutt.o \
         monolib_spinctrl.o \
         monolib_slider.o \
         monolib_spinbutt.o \
         monolib_spinctrl.o \
+       monolib_srchctrl.o \
         monolib_statbmp.o \
         monolib_statbox.o \
         monolib_statbrma.o \
         monolib_statbmp.o \
         monolib_statbox.o \
         monolib_statbrma.o \
@@ -6278,15 +6545,15 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 =  \
         monolib_tbarwce.o \
         monolib_textctrlce.o
  @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1)
         monolib_tbarwce.o \
         monolib_textctrlce.o
  @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1)
-COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_1 =  \
-       monolib_snglinst.o \
-       monolib_webkit.o \
-       monolib_fontdlgosx.o \
-       monolib_colordlgosx.o
-@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_1 = $(COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_1)
+@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_1 = \
+@COND_PLATFORM_MACOSX_1@       monolib_webkit.o monolib_fontdlgosx.o \
+@COND_PLATFORM_MACOSX_1@       monolib_colordlgosx.o
  @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \
  @COND_TOOLKIT_COCOA@   monolib_gsockosx.o monolib_hid.o monolib_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3 =  \
  @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \
  @COND_TOOLKIT_COCOA@   monolib_gsockosx.o monolib_hid.o monolib_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3 =  \
+       monolib_fontmgrcmn.o \
+       monolib_gsocketiohandler.o \
+       monolib_selectdispatcher.o \
         monolib_caret.o \
         monolib_colour.o \
         monolib_icon.o \
         monolib_caret.o \
         monolib_colour.o \
         monolib_icon.o \
@@ -6304,6 +6571,8 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3 =  \
         monolib_evtloop.o \
         monolib_font.o \
         monolib_fontenum.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_overlay.o \
         monolib_pen.o \
         monolib_region.o \
@@ -6364,6 +6633,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_3 =  \
         monolib_icon.o \
         monolib_paletteg.o \
         monolib_app.o \
         monolib_icon.o \
         monolib_paletteg.o \
         monolib_app.o \
+       monolib_assertdlg_gtk.o \
         monolib_bitmap.o \
         monolib_brush.o \
         monolib_clipbrd.o \
         monolib_bitmap.o \
         monolib_brush.o \
         monolib_clipbrd.o \
@@ -6379,7 +6649,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_3 =  \
         monolib_evtloop.o \
         monolib_font.o \
         monolib_gsockgtk.o \
         monolib_evtloop.o \
         monolib_font.o \
         monolib_gsockgtk.o \
-       monolib_main.o \
         monolib_minifram.o \
         monolib_pen.o \
         monolib_popupwin.o \
         monolib_minifram.o \
         monolib_pen.o \
         monolib_popupwin.o \
@@ -6396,6 +6665,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_3 =  \
  @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_3 = \
  @COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_0)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_3 =  \
  @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_3 = \
  @COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_0)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_3 =  \
+       monolib_fontmgrcmn.o \
         monolib_caret.o \
         monolib_colour.o \
         monolib_icon.o \
         monolib_caret.o \
         monolib_colour.o \
         monolib_icon.o \
@@ -6416,6 +6686,7 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_3 =  \
         monolib_evtloop.o \
         monolib_font.o \
         monolib_fontenum.o \
         monolib_evtloop.o \
         monolib_font.o \
         monolib_fontenum.o \
+       monolib_fontmgr.o \
         monolib_fontutil.o \
         monolib_palette.o \
         monolib_pen.o \
         monolib_fontutil.o \
         monolib_palette.o \
         monolib_pen.o \
@@ -6463,6 +6734,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 =  \
         monolib_fontutil.o \
         monolib_gdiimage.o \
         monolib_gdiobj.o \
         monolib_fontutil.o \
         monolib_gdiimage.o \
         monolib_gdiobj.o \
+       monolib_gdiplus.o \
         monolib_graphics.o \
         monolib_gsockmsw.o \
         monolib_icon.o \
         monolib_graphics.o \
         monolib_gsockmsw.o \
         monolib_icon.o \
@@ -6516,6 +6788,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_3 =  \
         monolib_fontutil.o \
         monolib_gdiimage.o \
         monolib_gdiobj.o \
         monolib_fontutil.o \
         monolib_gdiimage.o \
         monolib_gdiobj.o \
+       monolib_gdiplus.o \
         monolib_graphics.o \
         monolib_gsockmsw.o \
         monolib_icon.o \
         monolib_graphics.o \
         monolib_gsockmsw.o \
         monolib_icon.o \
@@ -6548,6 +6821,8 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 =  \
         monolib_fontutil.o \
         monolib_utilsx11.o \
         monolib_displayx11.o \
         monolib_fontutil.o \
         monolib_utilsx11.o \
         monolib_displayx11.o \
+       monolib_gsocketiohandler.o \
+       monolib_selectdispatcher.o \
         monolib_icon.o \
         monolib_timer.o \
         monolib_app.o \
         monolib_icon.o \
         monolib_timer.o \
         monolib_app.o \
@@ -6564,7 +6839,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 =  \
         monolib_dcscreen.o \
         monolib_evtloop.o \
         monolib_font.o \
         monolib_dcscreen.o \
         monolib_evtloop.o \
         monolib_font.o \
-       monolib_gsockx11.o \
         monolib_minifram.o \
         monolib_nanox.o \
         monolib_palette.o \
         monolib_minifram.o \
         monolib_nanox.o \
         monolib_palette.o \
@@ -6581,17 +6855,18 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 =  \
  COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_1 =  \
         monolib_animatecmn.o \
         monolib_datavcmn.o \
  COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_1 =  \
         monolib_animatecmn.o \
         monolib_datavcmn.o \
+       monolib_hyperlnkcmn.o \
         monolib_aboutdlgg.o \
         monolib_aboutdlgg.o \
+       monolib_animateg.o \
         monolib_bmpcboxg.o \
         monolib_calctrl.o \
         monolib_bmpcboxg.o \
         monolib_calctrl.o \
-       monolib_collpaneg.o \
         monolib_datavgen.o \
         monolib_datectlg.o \
         monolib_grid.o \
         monolib_gridctrl.o \
         monolib_gridsel.o \
         monolib_helpext.o \
         monolib_datavgen.o \
         monolib_datectlg.o \
         monolib_grid.o \
         monolib_gridctrl.o \
         monolib_gridsel.o \
         monolib_helpext.o \
-       monolib_hyperlink.o \
+       monolib_hyperlinkg.o \
         monolib_laywin.o \
         monolib_odcombo.o \
         monolib_propdlg.o \
         monolib_laywin.o \
         monolib_odcombo.o \
         monolib_propdlg.o \
@@ -6605,17 +6880,18 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_1 =  \
  COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_1 =  \
         monolib_animatecmn.o \
         monolib_datavcmn.o \
  COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_1 =  \
         monolib_animatecmn.o \
         monolib_datavcmn.o \
+       monolib_hyperlnkcmn.o \
         monolib_aboutdlgg.o \
         monolib_aboutdlgg.o \
+       monolib_animateg.o \
         monolib_bmpcboxg.o \
         monolib_calctrl.o \
         monolib_bmpcboxg.o \
         monolib_calctrl.o \
-       monolib_collpaneg.o \
         monolib_datavgen.o \
         monolib_datectlg.o \
         monolib_grid.o \
         monolib_gridctrl.o \
         monolib_gridsel.o \
         monolib_helpext.o \
         monolib_datavgen.o \
         monolib_datectlg.o \
         monolib_grid.o \
         monolib_gridctrl.o \
         monolib_gridsel.o \
         monolib_helpext.o \
-       monolib_hyperlink.o \
+       monolib_hyperlinkg.o \
         monolib_laywin.o \
         monolib_odcombo.o \
         monolib_propdlg.o \
         monolib_laywin.o \
         monolib_odcombo.o \
         monolib_propdlg.o \
@@ -6633,13 +6909,19 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_1 =  \
  @COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_mediactrl.o 
  @COND_TOOLKIT_MAC@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_mediactrl.o
  @COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_mediactrl.o
  @COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_mediactrl.o 
  @COND_TOOLKIT_MAC@__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 = \
-@COND_TOOLKIT_MSW@     monolib_mediactrl_am.o monolib_mediactrl_wmp10.o \
-@COND_TOOLKIT_MSW@     monolib_activex.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_PM@__MEDIA_PLATFORM_SRC_OBJECTS_1 = 
  @COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS_1 = 
-@COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_1 = \
-@COND_TOOLKIT_WINCE@   monolib_mediactrl_am.o monolib_mediactrl_wmp10.o \
-@COND_TOOLKIT_WINCE@   monolib_activex.o
+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_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_X11@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_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
@@ -6650,6 +6932,8 @@ COND_MONOLITHIC_0_SHARED_1___basedll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1@__basedll___depname = $(COND_MONOLITHIC_0_SHARED_1___basedll___depname)
  @COND_MONOLITHIC_0_SHARED_1@__install_basedll___depname = install_basedll
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1@__basedll___depname = $(COND_MONOLITHIC_0_SHARED_1___basedll___depname)
  @COND_MONOLITHIC_0_SHARED_1@__install_basedll___depname = install_basedll
+@COND_MONOLITHIC_0_SHARED_1@__uninstall_basedll___depname \
+@COND_MONOLITHIC_0_SHARED_1@   = uninstall_basedll
  COND_PLATFORM_MACOSX_1___basedll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__basedll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___basedll___macinstnamecmd)
  COND_PLATFORM_MACOSX_1___basedll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__basedll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___basedll___macinstnamecmd)
@@ -6657,7 +6941,7 @@ COND_PLATFORM_OS2_1___basedll___importlib = -import \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__basedll___importlib = $(COND_PLATFORM_OS2_1___basedll___importlib)
  COND_WINDOWS_IMPLIB_1___basedll___importlib = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__basedll___importlib = $(COND_PLATFORM_OS2_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)
+       -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_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 \
@@ -6690,6 +6974,10 @@ COND_USE_SOSYMLINKS_1___basedll___so_symlinks_inst_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)
  @COND_USE_SOSYMLINKS_1@__basedll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___basedll___so_symlinks_inst_cmd)
         $(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 \
+       $(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_PLATFORM_WIN32_1@__basedll___win32rc = basedll_version_rc.o
  @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_2 \
  @COND_PLATFORM_MACOSX_1@       = $(__BASE_MACOSX_SRC_OBJECTS_2)
  @COND_PLATFORM_WIN32_1@__basedll___win32rc = basedll_version_rc.o
  @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS_2 \
  @COND_PLATFORM_MACOSX_1@       = $(__BASE_MACOSX_SRC_OBJECTS_2)
@@ -6805,6 +7093,7 @@ COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2 =  \
         basedll_utilsexc_base.o \
         basedll_baseunix.o \
         basedll_dlunix.o \
         basedll_utilsexc_base.o \
         basedll_baseunix.o \
         basedll_dlunix.o \
+       basedll_snglinst.o \
         basedll_stdpaths.o
  @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2)
  COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_2 =  \
         basedll_stdpaths.o
  @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2)
  COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_2 =  \
@@ -6846,6 +7135,8 @@ 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
         $(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_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
@@ -6965,6 +7256,7 @@ COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3 =  \
         baselib_utilsexc_base.o \
         baselib_baseunix.o \
         baselib_dlunix.o \
         baselib_utilsexc_base.o \
         baselib_baseunix.o \
         baselib_dlunix.o \
+       baselib_snglinst.o \
         baselib_stdpaths.o
  @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3)
  COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_3 =  \
         baselib_stdpaths.o
  @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3)
  COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_3 =  \
@@ -7002,10 +7294,13 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_3 =  \
  @COND_PLATFORM_WIN32_1@        = baselib_main.o baselib_mslu.o baselib_volume.o
  @COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3 = \
  @COND_TOOLKIT_MAC@     baselib_utils.o baselib_uma.o
  @COND_PLATFORM_WIN32_1@        = baselib_main.o baselib_mslu.o baselib_volume.o
  @COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3 = \
  @COND_TOOLKIT_MAC@     baselib_utils.o baselib_uma.o
+@COND_SHARED_1@____wxbase_namedll_DEP = $(__basedll___depname)
+@COND_SHARED_0@____wxbase_namelib_DEP = $(__baselib___depname)
  COND_MONOLITHIC_0_SHARED_1___netdll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1@__netdll___depname = $(COND_MONOLITHIC_0_SHARED_1___netdll___depname)
  @COND_MONOLITHIC_0_SHARED_1@__install_netdll___depname = install_netdll
  COND_MONOLITHIC_0_SHARED_1___netdll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1@__netdll___depname = $(COND_MONOLITHIC_0_SHARED_1___netdll___depname)
  @COND_MONOLITHIC_0_SHARED_1@__install_netdll___depname = install_netdll
+@COND_MONOLITHIC_0_SHARED_1@__uninstall_netdll___depname = uninstall_netdll
  COND_PLATFORM_MACOSX_1___netdll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__netdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___netdll___macinstnamecmd)
  COND_PLATFORM_MACOSX_1___netdll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__netdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___netdll___macinstnamecmd)
@@ -7013,7 +7308,7 @@ COND_PLATFORM_OS2_1___netdll___importlib = -import \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__netdll___importlib = $(COND_PLATFORM_OS2_1___netdll___importlib)
  COND_WINDOWS_IMPLIB_1___netdll___importlib = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__netdll___importlib = $(COND_PLATFORM_OS2_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)
+       -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_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 \
@@ -7046,6 +7341,10 @@ COND_USE_SOSYMLINKS_1___netdll___so_symlinks_inst_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)
  @COND_USE_SOSYMLINKS_1@__netdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___netdll___so_symlinks_inst_cmd)
         $(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 \
+       $(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_PLATFORM_WIN32_1@__netdll___win32rc = netdll_version_rc.o
  @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.o
  @COND_PLATFORM_MACOS_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.o
  @COND_PLATFORM_WIN32_1@__netdll___win32rc = netdll_version_rc.o
  @COND_PLATFORM_MACOSX_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.o
  @COND_PLATFORM_MACOS_1@__NET_PLATFORM_SRC_OBJECTS_2 = netdll_gsocket.o
@@ -7059,6 +7358,7 @@ 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
         $(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_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
@@ -7072,11 +7372,15 @@ COND_MONOLITHIC_0_SHARED_0___netlib___depname = \
  @COND_PLATFORM_WIN32_1@        = netlib_gsocket.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_PLATFORM_WIN32_1@        = netlib_gsocket.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_MONOLITHIC_0_SHARED_1_USE_GUI_1___coredll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__coredll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___coredll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__install_coredll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ = install_coredll
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___coredll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__coredll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___coredll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__install_coredll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ = install_coredll
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__uninstall_coredll___depname \
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ = uninstall_coredll
  COND_PLATFORM_MACOSX_1___coredll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__coredll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___coredll___macinstnamecmd)
  COND_PLATFORM_MACOSX_1___coredll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__coredll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___coredll___macinstnamecmd)
@@ -7084,7 +7388,7 @@ COND_PLATFORM_OS2_1___coredll___importlib = -import \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__coredll___importlib = $(COND_PLATFORM_OS2_1___coredll___importlib)
  COND_WINDOWS_IMPLIB_1___coredll___importlib = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__coredll___importlib = $(COND_PLATFORM_OS2_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)
+       -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_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 \
@@ -7117,6 +7421,10 @@ COND_USE_SOSYMLINKS_1___coredll___so_symlinks_inst_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)
  @COND_USE_SOSYMLINKS_1@__coredll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___coredll___so_symlinks_inst_cmd)
         $(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 \
+       $(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_PLATFORM_WIN32_1@__coredll___win32rc = coredll_version_rc.o
  @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4 \
  @COND_PLATFORM_MACOSX_1@       = coredll_utilsunx.o
  @COND_PLATFORM_WIN32_1@__coredll___win32rc = coredll_version_rc.o
  @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4 \
  @COND_PLATFORM_MACOSX_1@       = coredll_utilsunx.o
@@ -7137,6 +7445,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
         coredll_artstd.o \
         coredll_bmpbase.o \
         coredll_bookctrl.o \
         coredll_artstd.o \
         coredll_bmpbase.o \
         coredll_bookctrl.o \
+       coredll_btncmn.o \
         coredll_choiccmn.o \
         coredll_clipcmn.o \
         coredll_clrpickercmn.o \
         coredll_choiccmn.o \
         coredll_clipcmn.o \
         coredll_clrpickercmn.o \
@@ -7152,6 +7461,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
         coredll_dcbase.o \
         coredll_dcbufcmn.o \
         coredll_dcgraph.o \
         coredll_dcbase.o \
         coredll_dcbufcmn.o \
         coredll_dcgraph.o \
+       coredll_dcsvg.o \
         coredll_dlgcmn.o \
         coredll_dndcmn.o \
         coredll_dobjcmn.o \
         coredll_dlgcmn.o \
         coredll_dndcmn.o \
         coredll_dobjcmn.o \
@@ -7168,6 +7478,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
         coredll_fontcmn.o \
         coredll_fontenumcmn.o \
         coredll_fontmap.o \
         coredll_fontcmn.o \
         coredll_fontenumcmn.o \
         coredll_fontmap.o \
+       coredll_fontutilcmn.o \
         coredll_framecmn.o \
         coredll_gaugecmn.o \
         coredll_gbsizer.o \
         coredll_framecmn.o \
         coredll_gaugecmn.o \
         coredll_gbsizer.o \
@@ -7187,6 +7498,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
         coredll_imagpcx.o \
         coredll_imagpng.o \
         coredll_imagpnm.o \
         coredll_imagpcx.o \
         coredll_imagpng.o \
         coredll_imagpnm.o \
+       coredll_imagtga.o \
         coredll_imagtiff.o \
         coredll_imagxpm.o \
         coredll_layout.o \
         coredll_imagtiff.o \
         coredll_imagxpm.o \
         coredll_layout.o \
@@ -7206,7 +7518,9 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
         coredll_rgncmn.o \
         coredll_settcmn.o \
         coredll_sizer.o \
         coredll_rgncmn.o \
         coredll_settcmn.o \
         coredll_sizer.o \
+       coredll_srchcmn.o \
         coredll_statbar.o \
         coredll_statbar.o \
+       coredll_stattextcmn.o \
         coredll_stockitem.o \
         coredll_tbarbase.o \
         coredll_textcmn.o \
         coredll_stockitem.o \
         coredll_tbarbase.o \
         coredll_textcmn.o \
@@ -7223,6 +7537,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
         coredll_choicdgg.o \
         coredll_choicbkg.o \
         coredll_clrpickerg.o \
         coredll_choicdgg.o \
         coredll_choicbkg.o \
         coredll_clrpickerg.o \
+       coredll_collpaneg.o \
         coredll_combog.o \
         coredll_dcpsg.o \
         coredll_dirctrlg.o \
         coredll_combog.o \
         coredll_dcpsg.o \
         coredll_dirctrlg.o \
@@ -7240,6 +7555,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
         coredll_selstore.o \
         coredll_spinctlg.o \
         coredll_splitter.o \
         coredll_selstore.o \
         coredll_spinctlg.o \
         coredll_splitter.o \
+       coredll_srchctlg.o \
         coredll_textdlgg.o \
         coredll_tipwin.o \
         coredll_toolbkg.o \
         coredll_textdlgg.o \
         coredll_tipwin.o \
         coredll_toolbkg.o \
@@ -7308,6 +7624,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
         coredll_artstd.o \
         coredll_bmpbase.o \
         coredll_bookctrl.o \
         coredll_artstd.o \
         coredll_bmpbase.o \
         coredll_bookctrl.o \
+       coredll_btncmn.o \
         coredll_choiccmn.o \
         coredll_clipcmn.o \
         coredll_clrpickercmn.o \
         coredll_choiccmn.o \
         coredll_clipcmn.o \
         coredll_clrpickercmn.o \
@@ -7323,6 +7640,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
         coredll_dcbase.o \
         coredll_dcbufcmn.o \
         coredll_dcgraph.o \
         coredll_dcbase.o \
         coredll_dcbufcmn.o \
         coredll_dcgraph.o \
+       coredll_dcsvg.o \
         coredll_dlgcmn.o \
         coredll_dndcmn.o \
         coredll_dobjcmn.o \
         coredll_dlgcmn.o \
         coredll_dndcmn.o \
         coredll_dobjcmn.o \
@@ -7339,6 +7657,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
         coredll_fontcmn.o \
         coredll_fontenumcmn.o \
         coredll_fontmap.o \
         coredll_fontcmn.o \
         coredll_fontenumcmn.o \
         coredll_fontmap.o \
+       coredll_fontutilcmn.o \
         coredll_framecmn.o \
         coredll_gaugecmn.o \
         coredll_gbsizer.o \
         coredll_framecmn.o \
         coredll_gaugecmn.o \
         coredll_gbsizer.o \
@@ -7358,6 +7677,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
         coredll_imagpcx.o \
         coredll_imagpng.o \
         coredll_imagpnm.o \
         coredll_imagpcx.o \
         coredll_imagpng.o \
         coredll_imagpnm.o \
+       coredll_imagtga.o \
         coredll_imagtiff.o \
         coredll_imagxpm.o \
         coredll_layout.o \
         coredll_imagtiff.o \
         coredll_imagxpm.o \
         coredll_layout.o \
@@ -7377,7 +7697,9 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
         coredll_rgncmn.o \
         coredll_settcmn.o \
         coredll_sizer.o \
         coredll_rgncmn.o \
         coredll_settcmn.o \
         coredll_sizer.o \
+       coredll_srchcmn.o \
         coredll_statbar.o \
         coredll_statbar.o \
+       coredll_stattextcmn.o \
         coredll_stockitem.o \
         coredll_tbarbase.o \
         coredll_textcmn.o \
         coredll_stockitem.o \
         coredll_tbarbase.o \
         coredll_textcmn.o \
@@ -7394,6 +7716,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
         coredll_choicdgg.o \
         coredll_choicbkg.o \
         coredll_clrpickerg.o \
         coredll_choicdgg.o \
         coredll_choicbkg.o \
         coredll_clrpickerg.o \
+       coredll_collpaneg.o \
         coredll_combog.o \
         coredll_dcpsg.o \
         coredll_dirctrlg.o \
         coredll_combog.o \
         coredll_dcpsg.o \
         coredll_dirctrlg.o \
@@ -7411,6 +7734,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
         coredll_selstore.o \
         coredll_spinctlg.o \
         coredll_splitter.o \
         coredll_selstore.o \
         coredll_spinctlg.o \
         coredll_splitter.o \
+       coredll_srchctlg.o \
         coredll_textdlgg.o \
         coredll_tipwin.o \
         coredll_toolbkg.o \
         coredll_textdlgg.o \
         coredll_tipwin.o \
         coredll_toolbkg.o \
@@ -7422,6 +7746,9 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
  @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_4 = \
  @COND_TOOLKIT_COCOA@   coredll_gsockosx.o coredll_hid.o coredll_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_4 =  \
  @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_4 = \
  @COND_TOOLKIT_COCOA@   coredll_gsockosx.o coredll_hid.o coredll_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_4 =  \
+       coredll_fontmgrcmn.o \
+       coredll_gsocketiohandler.o \
+       coredll_selectdispatcher.o \
         coredll_caret.o \
         coredll_colour.o \
         coredll_icon.o \
         coredll_caret.o \
         coredll_colour.o \
         coredll_icon.o \
@@ -7439,6 +7766,8 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_4 =  \
         coredll_evtloop.o \
         coredll_font.o \
         coredll_fontenum.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_overlay.o \
         coredll_pen.o \
         coredll_region.o \
@@ -7499,6 +7828,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_4 =  \
         coredll_icon.o \
         coredll_paletteg.o \
         coredll_app.o \
         coredll_icon.o \
         coredll_paletteg.o \
         coredll_app.o \
+       coredll_assertdlg_gtk.o \
         coredll_bitmap.o \
         coredll_brush.o \
         coredll_clipbrd.o \
         coredll_bitmap.o \
         coredll_brush.o \
         coredll_clipbrd.o \
@@ -7514,7 +7844,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_4 =  \
         coredll_evtloop.o \
         coredll_font.o \
         coredll_gsockgtk.o \
         coredll_evtloop.o \
         coredll_font.o \
         coredll_gsockgtk.o \
-       coredll_main.o \
         coredll_minifram.o \
         coredll_pen.o \
         coredll_popupwin.o \
         coredll_minifram.o \
         coredll_pen.o \
         coredll_popupwin.o \
@@ -7531,6 +7860,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_4 =  \
  @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_4 = \
  @COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_8)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_4 =  \
  @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_4 = \
  @COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_8)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_4 =  \
+       coredll_fontmgrcmn.o \
         coredll_caret.o \
         coredll_colour.o \
         coredll_icon.o \
         coredll_caret.o \
         coredll_colour.o \
         coredll_icon.o \
@@ -7551,6 +7881,7 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_4 =  \
         coredll_evtloop.o \
         coredll_font.o \
         coredll_fontenum.o \
         coredll_evtloop.o \
         coredll_font.o \
         coredll_fontenum.o \
+       coredll_fontmgr.o \
         coredll_fontutil.o \
         coredll_palette.o \
         coredll_pen.o \
         coredll_fontutil.o \
         coredll_palette.o \
         coredll_pen.o \
@@ -7598,6 +7929,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 =  \
         coredll_fontutil.o \
         coredll_gdiimage.o \
         coredll_gdiobj.o \
         coredll_fontutil.o \
         coredll_gdiimage.o \
         coredll_gdiobj.o \
+       coredll_gdiplus.o \
         coredll_graphics.o \
         coredll_gsockmsw.o \
         coredll_icon.o \
         coredll_graphics.o \
         coredll_gsockmsw.o \
         coredll_icon.o \
@@ -7651,6 +7983,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_4 =  \
         coredll_fontutil.o \
         coredll_gdiimage.o \
         coredll_gdiobj.o \
         coredll_fontutil.o \
         coredll_gdiimage.o \
         coredll_gdiobj.o \
+       coredll_gdiplus.o \
         coredll_graphics.o \
         coredll_gsockmsw.o \
         coredll_icon.o \
         coredll_graphics.o \
         coredll_gsockmsw.o \
         coredll_icon.o \
@@ -7683,6 +8016,8 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_4 =  \
         coredll_fontutil.o \
         coredll_utilsx11.o \
         coredll_displayx11.o \
         coredll_fontutil.o \
         coredll_utilsx11.o \
         coredll_displayx11.o \
+       coredll_gsocketiohandler.o \
+       coredll_selectdispatcher.o \
         coredll_icon.o \
         coredll_timer.o \
         coredll_app.o \
         coredll_icon.o \
         coredll_timer.o \
         coredll_app.o \
@@ -7699,7 +8034,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_4 =  \
         coredll_dcscreen.o \
         coredll_evtloop.o \
         coredll_font.o \
         coredll_dcscreen.o \
         coredll_evtloop.o \
         coredll_font.o \
-       coredll_gsockx11.o \
         coredll_minifram.o \
         coredll_nanox.o \
         coredll_palette.o \
         coredll_minifram.o \
         coredll_nanox.o \
         coredll_palette.o \
@@ -7864,6 +8198,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2 =  \
         coredll_checkbox.o \
         coredll_checklst.o \
         coredll_choice.o \
         coredll_checkbox.o \
         coredll_checklst.o \
         coredll_choice.o \
+       coredll_collpane.o \
         coredll_colordlg.o \
         coredll_combobox.o \
         coredll_control.o \
         coredll_colordlg.o \
         coredll_combobox.o \
         coredll_control.o \
@@ -7904,6 +8239,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2 =  \
         coredll_accel.o \
         coredll_aga.o \
         coredll_app.o \
         coredll_accel.o \
         coredll_aga.o \
         coredll_app.o \
+       coredll_artmac.o \
         coredll_bitmap.o \
         coredll_bmpbuttn.o \
         coredll_brush.o \
         coredll_bitmap.o \
         coredll_bmpbuttn.o \
         coredll_brush.o \
@@ -7964,6 +8300,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2 =  \
         coredll_slider.o \
         coredll_spinbutt.o \
         coredll_spinctrl.o \
         coredll_slider.o \
         coredll_spinbutt.o \
         coredll_spinctrl.o \
+       coredll_srchctrl.o \
         coredll_statbmp.o \
         coredll_statbox.o \
         coredll_statbrma.o \
         coredll_statbmp.o \
         coredll_statbox.o \
         coredll_statbrma.o \
@@ -8242,15 +8579,15 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 =  \
         coredll_tbarwce.o \
         coredll_textctrlce.o
  @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2)
         coredll_tbarwce.o \
         coredll_textctrlce.o
  @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2)
-COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_2 =  \
-       coredll_snglinst.o \
-       coredll_webkit.o \
-       coredll_fontdlgosx.o \
-       coredll_colordlgosx.o
-@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_2 = $(COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_2)
+@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_2 = \
+@COND_PLATFORM_MACOSX_1@       coredll_webkit.o coredll_fontdlgosx.o \
+@COND_PLATFORM_MACOSX_1@       coredll_colordlgosx.o
  @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \
  @COND_TOOLKIT_COCOA@   coredll_gsockosx.o coredll_hid.o coredll_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5 =  \
  @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \
  @COND_TOOLKIT_COCOA@   coredll_gsockosx.o coredll_hid.o coredll_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5 =  \
+       coredll_fontmgrcmn.o \
+       coredll_gsocketiohandler.o \
+       coredll_selectdispatcher.o \
         coredll_caret.o \
         coredll_colour.o \
         coredll_icon.o \
         coredll_caret.o \
         coredll_colour.o \
         coredll_icon.o \
@@ -8268,6 +8605,8 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5 =  \
         coredll_evtloop.o \
         coredll_font.o \
         coredll_fontenum.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_overlay.o \
         coredll_pen.o \
         coredll_region.o \
@@ -8328,6 +8667,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_5 =  \
         coredll_icon.o \
         coredll_paletteg.o \
         coredll_app.o \
         coredll_icon.o \
         coredll_paletteg.o \
         coredll_app.o \
+       coredll_assertdlg_gtk.o \
         coredll_bitmap.o \
         coredll_brush.o \
         coredll_clipbrd.o \
         coredll_bitmap.o \
         coredll_brush.o \
         coredll_clipbrd.o \
@@ -8343,7 +8683,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_5 =  \
         coredll_evtloop.o \
         coredll_font.o \
         coredll_gsockgtk.o \
         coredll_evtloop.o \
         coredll_font.o \
         coredll_gsockgtk.o \
-       coredll_main.o \
         coredll_minifram.o \
         coredll_pen.o \
         coredll_popupwin.o \
         coredll_minifram.o \
         coredll_pen.o \
         coredll_popupwin.o \
@@ -8360,6 +8699,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_5 =  \
  @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_5 = \
  @COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_8)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_5 =  \
  @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_5 = \
  @COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_8)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_5 =  \
+       coredll_fontmgrcmn.o \
         coredll_caret.o \
         coredll_colour.o \
         coredll_icon.o \
         coredll_caret.o \
         coredll_colour.o \
         coredll_icon.o \
@@ -8380,6 +8720,7 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_5 =  \
         coredll_evtloop.o \
         coredll_font.o \
         coredll_fontenum.o \
         coredll_evtloop.o \
         coredll_font.o \
         coredll_fontenum.o \
+       coredll_fontmgr.o \
         coredll_fontutil.o \
         coredll_palette.o \
         coredll_pen.o \
         coredll_fontutil.o \
         coredll_palette.o \
         coredll_pen.o \
@@ -8427,6 +8768,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 =  \
         coredll_fontutil.o \
         coredll_gdiimage.o \
         coredll_gdiobj.o \
         coredll_fontutil.o \
         coredll_gdiimage.o \
         coredll_gdiobj.o \
+       coredll_gdiplus.o \
         coredll_graphics.o \
         coredll_gsockmsw.o \
         coredll_icon.o \
         coredll_graphics.o \
         coredll_gsockmsw.o \
         coredll_icon.o \
@@ -8480,6 +8822,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_5 =  \
         coredll_fontutil.o \
         coredll_gdiimage.o \
         coredll_gdiobj.o \
         coredll_fontutil.o \
         coredll_gdiimage.o \
         coredll_gdiobj.o \
+       coredll_gdiplus.o \
         coredll_graphics.o \
         coredll_gsockmsw.o \
         coredll_icon.o \
         coredll_graphics.o \
         coredll_gsockmsw.o \
         coredll_icon.o \
@@ -8512,6 +8855,8 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_5 =  \
         coredll_fontutil.o \
         coredll_utilsx11.o \
         coredll_displayx11.o \
         coredll_fontutil.o \
         coredll_utilsx11.o \
         coredll_displayx11.o \
+       coredll_gsocketiohandler.o \
+       coredll_selectdispatcher.o \
         coredll_icon.o \
         coredll_timer.o \
         coredll_app.o \
         coredll_icon.o \
         coredll_timer.o \
         coredll_app.o \
@@ -8528,7 +8873,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_5 =  \
         coredll_dcscreen.o \
         coredll_evtloop.o \
         coredll_font.o \
         coredll_dcscreen.o \
         coredll_evtloop.o \
         coredll_font.o \
-       coredll_gsockx11.o \
         coredll_minifram.o \
         coredll_nanox.o \
         coredll_palette.o \
         coredll_minifram.o \
         coredll_nanox.o \
         coredll_palette.o \
@@ -8547,6 +8891,8 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname = \
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__corelib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__install_corelib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = install_corelib
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__corelib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__install_corelib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = install_corelib
+@COND_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_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
@@ -8571,6 +8917,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
         corelib_artstd.o \
         corelib_bmpbase.o \
         corelib_bookctrl.o \
         corelib_artstd.o \
         corelib_bmpbase.o \
         corelib_bookctrl.o \
+       corelib_btncmn.o \
         corelib_choiccmn.o \
         corelib_clipcmn.o \
         corelib_clrpickercmn.o \
         corelib_choiccmn.o \
         corelib_clipcmn.o \
         corelib_clrpickercmn.o \
@@ -8586,6 +8933,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
         corelib_dcbase.o \
         corelib_dcbufcmn.o \
         corelib_dcgraph.o \
         corelib_dcbase.o \
         corelib_dcbufcmn.o \
         corelib_dcgraph.o \
+       corelib_dcsvg.o \
         corelib_dlgcmn.o \
         corelib_dndcmn.o \
         corelib_dobjcmn.o \
         corelib_dlgcmn.o \
         corelib_dndcmn.o \
         corelib_dobjcmn.o \
@@ -8602,6 +8950,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
         corelib_fontcmn.o \
         corelib_fontenumcmn.o \
         corelib_fontmap.o \
         corelib_fontcmn.o \
         corelib_fontenumcmn.o \
         corelib_fontmap.o \
+       corelib_fontutilcmn.o \
         corelib_framecmn.o \
         corelib_gaugecmn.o \
         corelib_gbsizer.o \
         corelib_framecmn.o \
         corelib_gaugecmn.o \
         corelib_gbsizer.o \
@@ -8621,6 +8970,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
         corelib_imagpcx.o \
         corelib_imagpng.o \
         corelib_imagpnm.o \
         corelib_imagpcx.o \
         corelib_imagpng.o \
         corelib_imagpnm.o \
+       corelib_imagtga.o \
         corelib_imagtiff.o \
         corelib_imagxpm.o \
         corelib_layout.o \
         corelib_imagtiff.o \
         corelib_imagxpm.o \
         corelib_layout.o \
@@ -8640,7 +8990,9 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
         corelib_rgncmn.o \
         corelib_settcmn.o \
         corelib_sizer.o \
         corelib_rgncmn.o \
         corelib_settcmn.o \
         corelib_sizer.o \
+       corelib_srchcmn.o \
         corelib_statbar.o \
         corelib_statbar.o \
+       corelib_stattextcmn.o \
         corelib_stockitem.o \
         corelib_tbarbase.o \
         corelib_textcmn.o \
         corelib_stockitem.o \
         corelib_tbarbase.o \
         corelib_textcmn.o \
@@ -8657,6 +9009,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
         corelib_choicdgg.o \
         corelib_choicbkg.o \
         corelib_clrpickerg.o \
         corelib_choicdgg.o \
         corelib_choicbkg.o \
         corelib_clrpickerg.o \
+       corelib_collpaneg.o \
         corelib_combog.o \
         corelib_dcpsg.o \
         corelib_dirctrlg.o \
         corelib_combog.o \
         corelib_dcpsg.o \
         corelib_dirctrlg.o \
@@ -8674,6 +9027,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
         corelib_selstore.o \
         corelib_spinctlg.o \
         corelib_splitter.o \
         corelib_selstore.o \
         corelib_spinctlg.o \
         corelib_splitter.o \
+       corelib_srchctlg.o \
         corelib_textdlgg.o \
         corelib_tipwin.o \
         corelib_toolbkg.o \
         corelib_textdlgg.o \
         corelib_tipwin.o \
         corelib_toolbkg.o \
@@ -8742,6 +9096,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
         corelib_artstd.o \
         corelib_bmpbase.o \
         corelib_bookctrl.o \
         corelib_artstd.o \
         corelib_bmpbase.o \
         corelib_bookctrl.o \
+       corelib_btncmn.o \
         corelib_choiccmn.o \
         corelib_clipcmn.o \
         corelib_clrpickercmn.o \
         corelib_choiccmn.o \
         corelib_clipcmn.o \
         corelib_clrpickercmn.o \
@@ -8757,6 +9112,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
         corelib_dcbase.o \
         corelib_dcbufcmn.o \
         corelib_dcgraph.o \
         corelib_dcbase.o \
         corelib_dcbufcmn.o \
         corelib_dcgraph.o \
+       corelib_dcsvg.o \
         corelib_dlgcmn.o \
         corelib_dndcmn.o \
         corelib_dobjcmn.o \
         corelib_dlgcmn.o \
         corelib_dndcmn.o \
         corelib_dobjcmn.o \
@@ -8773,6 +9129,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
         corelib_fontcmn.o \
         corelib_fontenumcmn.o \
         corelib_fontmap.o \
         corelib_fontcmn.o \
         corelib_fontenumcmn.o \
         corelib_fontmap.o \
+       corelib_fontutilcmn.o \
         corelib_framecmn.o \
         corelib_gaugecmn.o \
         corelib_gbsizer.o \
         corelib_framecmn.o \
         corelib_gaugecmn.o \
         corelib_gbsizer.o \
@@ -8792,6 +9149,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
         corelib_imagpcx.o \
         corelib_imagpng.o \
         corelib_imagpnm.o \
         corelib_imagpcx.o \
         corelib_imagpng.o \
         corelib_imagpnm.o \
+       corelib_imagtga.o \
         corelib_imagtiff.o \
         corelib_imagxpm.o \
         corelib_layout.o \
         corelib_imagtiff.o \
         corelib_imagxpm.o \
         corelib_layout.o \
@@ -8811,7 +9169,9 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
         corelib_rgncmn.o \
         corelib_settcmn.o \
         corelib_sizer.o \
         corelib_rgncmn.o \
         corelib_settcmn.o \
         corelib_sizer.o \
+       corelib_srchcmn.o \
         corelib_statbar.o \
         corelib_statbar.o \
+       corelib_stattextcmn.o \
         corelib_stockitem.o \
         corelib_tbarbase.o \
         corelib_textcmn.o \
         corelib_stockitem.o \
         corelib_tbarbase.o \
         corelib_textcmn.o \
@@ -8828,6 +9188,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
         corelib_choicdgg.o \
         corelib_choicbkg.o \
         corelib_clrpickerg.o \
         corelib_choicdgg.o \
         corelib_choicbkg.o \
         corelib_clrpickerg.o \
+       corelib_collpaneg.o \
         corelib_combog.o \
         corelib_dcpsg.o \
         corelib_dirctrlg.o \
         corelib_combog.o \
         corelib_dcpsg.o \
         corelib_dirctrlg.o \
@@ -8845,6 +9206,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
         corelib_selstore.o \
         corelib_spinctlg.o \
         corelib_splitter.o \
         corelib_selstore.o \
         corelib_spinctlg.o \
         corelib_splitter.o \
+       corelib_srchctlg.o \
         corelib_textdlgg.o \
         corelib_tipwin.o \
         corelib_toolbkg.o \
         corelib_textdlgg.o \
         corelib_tipwin.o \
         corelib_toolbkg.o \
@@ -8856,6 +9218,9 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
  @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_6 = \
  @COND_TOOLKIT_COCOA@   corelib_gsockosx.o corelib_hid.o corelib_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_6 =  \
  @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_6 = \
  @COND_TOOLKIT_COCOA@   corelib_gsockosx.o corelib_hid.o corelib_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_6 =  \
+       corelib_fontmgrcmn.o \
+       corelib_gsocketiohandler.o \
+       corelib_selectdispatcher.o \
         corelib_caret.o \
         corelib_colour.o \
         corelib_icon.o \
         corelib_caret.o \
         corelib_colour.o \
         corelib_icon.o \
@@ -8873,6 +9238,8 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_6 =  \
         corelib_evtloop.o \
         corelib_font.o \
         corelib_fontenum.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_overlay.o \
         corelib_pen.o \
         corelib_region.o \
@@ -8933,6 +9300,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_6 =  \
         corelib_icon.o \
         corelib_paletteg.o \
         corelib_app.o \
         corelib_icon.o \
         corelib_paletteg.o \
         corelib_app.o \
+       corelib_assertdlg_gtk.o \
         corelib_bitmap.o \
         corelib_brush.o \
         corelib_clipbrd.o \
         corelib_bitmap.o \
         corelib_brush.o \
         corelib_clipbrd.o \
@@ -8948,7 +9316,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_6 =  \
         corelib_evtloop.o \
         corelib_font.o \
         corelib_gsockgtk.o \
         corelib_evtloop.o \
         corelib_font.o \
         corelib_gsockgtk.o \
-       corelib_main.o \
         corelib_minifram.o \
         corelib_pen.o \
         corelib_popupwin.o \
         corelib_minifram.o \
         corelib_pen.o \
         corelib_popupwin.o \
@@ -8965,6 +9332,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_6 =  \
  @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_6 = \
  @COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_9)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_6 =  \
  @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_6 = \
  @COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_9)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_6 =  \
+       corelib_fontmgrcmn.o \
         corelib_caret.o \
         corelib_colour.o \
         corelib_icon.o \
         corelib_caret.o \
         corelib_colour.o \
         corelib_icon.o \
@@ -8985,6 +9353,7 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_6 =  \
         corelib_evtloop.o \
         corelib_font.o \
         corelib_fontenum.o \
         corelib_evtloop.o \
         corelib_font.o \
         corelib_fontenum.o \
+       corelib_fontmgr.o \
         corelib_fontutil.o \
         corelib_palette.o \
         corelib_pen.o \
         corelib_fontutil.o \
         corelib_palette.o \
         corelib_pen.o \
@@ -9032,6 +9401,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 =  \
         corelib_fontutil.o \
         corelib_gdiimage.o \
         corelib_gdiobj.o \
         corelib_fontutil.o \
         corelib_gdiimage.o \
         corelib_gdiobj.o \
+       corelib_gdiplus.o \
         corelib_graphics.o \
         corelib_gsockmsw.o \
         corelib_icon.o \
         corelib_graphics.o \
         corelib_gsockmsw.o \
         corelib_icon.o \
@@ -9085,6 +9455,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_6 =  \
         corelib_fontutil.o \
         corelib_gdiimage.o \
         corelib_gdiobj.o \
         corelib_fontutil.o \
         corelib_gdiimage.o \
         corelib_gdiobj.o \
+       corelib_gdiplus.o \
         corelib_graphics.o \
         corelib_gsockmsw.o \
         corelib_icon.o \
         corelib_graphics.o \
         corelib_gsockmsw.o \
         corelib_icon.o \
@@ -9117,6 +9488,8 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_6 =  \
         corelib_fontutil.o \
         corelib_utilsx11.o \
         corelib_displayx11.o \
         corelib_fontutil.o \
         corelib_utilsx11.o \
         corelib_displayx11.o \
+       corelib_gsocketiohandler.o \
+       corelib_selectdispatcher.o \
         corelib_icon.o \
         corelib_timer.o \
         corelib_app.o \
         corelib_icon.o \
         corelib_timer.o \
         corelib_app.o \
@@ -9133,7 +9506,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_6 =  \
         corelib_dcscreen.o \
         corelib_evtloop.o \
         corelib_font.o \
         corelib_dcscreen.o \
         corelib_evtloop.o \
         corelib_font.o \
-       corelib_gsockx11.o \
         corelib_minifram.o \
         corelib_nanox.o \
         corelib_palette.o \
         corelib_minifram.o \
         corelib_nanox.o \
         corelib_palette.o \
@@ -9298,6 +9670,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3 =  \
         corelib_checkbox.o \
         corelib_checklst.o \
         corelib_choice.o \
         corelib_checkbox.o \
         corelib_checklst.o \
         corelib_choice.o \
+       corelib_collpane.o \
         corelib_colordlg.o \
         corelib_combobox.o \
         corelib_control.o \
         corelib_colordlg.o \
         corelib_combobox.o \
         corelib_control.o \
@@ -9338,6 +9711,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3 =  \
         corelib_accel.o \
         corelib_aga.o \
         corelib_app.o \
         corelib_accel.o \
         corelib_aga.o \
         corelib_app.o \
+       corelib_artmac.o \
         corelib_bitmap.o \
         corelib_bmpbuttn.o \
         corelib_brush.o \
         corelib_bitmap.o \
         corelib_bmpbuttn.o \
         corelib_brush.o \
@@ -9398,6 +9772,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3 =  \
         corelib_slider.o \
         corelib_spinbutt.o \
         corelib_spinctrl.o \
         corelib_slider.o \
         corelib_spinbutt.o \
         corelib_spinctrl.o \
+       corelib_srchctrl.o \
         corelib_statbmp.o \
         corelib_statbox.o \
         corelib_statbrma.o \
         corelib_statbmp.o \
         corelib_statbox.o \
         corelib_statbrma.o \
@@ -9676,15 +10051,15 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 =  \
         corelib_tbarwce.o \
         corelib_textctrlce.o
  @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3)
         corelib_tbarwce.o \
         corelib_textctrlce.o
  @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3)
-COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_3 =  \
-       corelib_snglinst.o \
-       corelib_webkit.o \
-       corelib_fontdlgosx.o \
-       corelib_colordlgosx.o
-@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_3 = $(COND_PLATFORM_MACOSX_1___MAC_OSX_SRC_OBJECTS_3)
+@COND_PLATFORM_MACOSX_1@__MAC_OSX_SRC_OBJECTS_3 = \
+@COND_PLATFORM_MACOSX_1@       corelib_webkit.o corelib_fontdlgosx.o \
+@COND_PLATFORM_MACOSX_1@       corelib_colordlgosx.o
  @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \
  @COND_TOOLKIT_COCOA@   corelib_gsockosx.o corelib_hid.o corelib_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7 =  \
  @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \
  @COND_TOOLKIT_COCOA@   corelib_gsockosx.o corelib_hid.o corelib_utilsexc_cf.o
  COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7 =  \
+       corelib_fontmgrcmn.o \
+       corelib_gsocketiohandler.o \
+       corelib_selectdispatcher.o \
         corelib_caret.o \
         corelib_colour.o \
         corelib_icon.o \
         corelib_caret.o \
         corelib_colour.o \
         corelib_icon.o \
@@ -9702,6 +10077,8 @@ COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7 =  \
         corelib_evtloop.o \
         corelib_font.o \
         corelib_fontenum.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_overlay.o \
         corelib_pen.o \
         corelib_region.o \
@@ -9762,6 +10139,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_7 =  \
         corelib_icon.o \
         corelib_paletteg.o \
         corelib_app.o \
         corelib_icon.o \
         corelib_paletteg.o \
         corelib_app.o \
+       corelib_assertdlg_gtk.o \
         corelib_bitmap.o \
         corelib_brush.o \
         corelib_clipbrd.o \
         corelib_bitmap.o \
         corelib_brush.o \
         corelib_clipbrd.o \
@@ -9777,7 +10155,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_7 =  \
         corelib_evtloop.o \
         corelib_font.o \
         corelib_gsockgtk.o \
         corelib_evtloop.o \
         corelib_font.o \
         corelib_gsockgtk.o \
-       corelib_main.o \
         corelib_minifram.o \
         corelib_pen.o \
         corelib_popupwin.o \
         corelib_minifram.o \
         corelib_pen.o \
         corelib_popupwin.o \
@@ -9794,6 +10171,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_7 =  \
  @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_7 = \
  @COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_9)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_7 =  \
  @COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_7 = \
  @COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_9)
  COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_7 =  \
+       corelib_fontmgrcmn.o \
         corelib_caret.o \
         corelib_colour.o \
         corelib_icon.o \
         corelib_caret.o \
         corelib_colour.o \
         corelib_icon.o \
@@ -9814,6 +10192,7 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_7 =  \
         corelib_evtloop.o \
         corelib_font.o \
         corelib_fontenum.o \
         corelib_evtloop.o \
         corelib_font.o \
         corelib_fontenum.o \
+       corelib_fontmgr.o \
         corelib_fontutil.o \
         corelib_palette.o \
         corelib_pen.o \
         corelib_fontutil.o \
         corelib_palette.o \
         corelib_pen.o \
@@ -9861,6 +10240,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 =  \
         corelib_fontutil.o \
         corelib_gdiimage.o \
         corelib_gdiobj.o \
         corelib_fontutil.o \
         corelib_gdiimage.o \
         corelib_gdiobj.o \
+       corelib_gdiplus.o \
         corelib_graphics.o \
         corelib_gsockmsw.o \
         corelib_icon.o \
         corelib_graphics.o \
         corelib_gsockmsw.o \
         corelib_icon.o \
@@ -9914,6 +10294,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_7 =  \
         corelib_fontutil.o \
         corelib_gdiimage.o \
         corelib_gdiobj.o \
         corelib_fontutil.o \
         corelib_gdiimage.o \
         corelib_gdiobj.o \
+       corelib_gdiplus.o \
         corelib_graphics.o \
         corelib_gsockmsw.o \
         corelib_icon.o \
         corelib_graphics.o \
         corelib_gsockmsw.o \
         corelib_icon.o \
@@ -9946,6 +10327,8 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7 =  \
         corelib_fontutil.o \
         corelib_utilsx11.o \
         corelib_displayx11.o \
         corelib_fontutil.o \
         corelib_utilsx11.o \
         corelib_displayx11.o \
+       corelib_gsocketiohandler.o \
+       corelib_selectdispatcher.o \
         corelib_icon.o \
         corelib_timer.o \
         corelib_app.o \
         corelib_icon.o \
         corelib_timer.o \
         corelib_app.o \
@@ -9962,7 +10345,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7 =  \
         corelib_dcscreen.o \
         corelib_evtloop.o \
         corelib_font.o \
         corelib_dcscreen.o \
         corelib_evtloop.o \
         corelib_font.o \
-       corelib_gsockx11.o \
         corelib_minifram.o \
         corelib_nanox.o \
         corelib_palette.o \
         corelib_minifram.o \
         corelib_nanox.o \
         corelib_palette.o \
@@ -9976,11 +10358,15 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7 =  \
         corelib_utilsx.o \
         corelib_window.o
  @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7)
         corelib_utilsx.o \
         corelib_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_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__advdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__install_advdll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ = install_advdll
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__advdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__install_advdll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ = install_advdll
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__uninstall_advdll___depname \
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ = uninstall_advdll
  COND_PLATFORM_MACOSX_1___advdll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__advdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___advdll___macinstnamecmd)
  COND_PLATFORM_MACOSX_1___advdll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__advdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___advdll___macinstnamecmd)
@@ -9988,7 +10374,7 @@ COND_PLATFORM_OS2_1___advdll___importlib = -import \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__advdll___importlib = $(COND_PLATFORM_OS2_1___advdll___importlib)
  COND_WINDOWS_IMPLIB_1___advdll___importlib = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__advdll___importlib = $(COND_PLATFORM_OS2_1___advdll___importlib)
  COND_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)
+       -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_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 \
@@ -10021,21 +10407,26 @@ COND_USE_SOSYMLINKS_1___advdll___so_symlinks_inst_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)
  @COND_USE_SOSYMLINKS_1@__advdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___advdll___so_symlinks_inst_cmd)
         $(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 \
+       $(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_PLATFORM_WIN32_1@__advdll___win32rc = advdll_version_rc.o
  COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_2 =  \
         advdll_animatecmn.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_datavcmn.o \
+       advdll_hyperlnkcmn.o \
         advdll_aboutdlgg.o \
         advdll_aboutdlgg.o \
+       advdll_animateg.o \
         advdll_bmpcboxg.o \
         advdll_calctrl.o \
         advdll_bmpcboxg.o \
         advdll_calctrl.o \
-       advdll_collpaneg.o \
         advdll_datavgen.o \
         advdll_datectlg.o \
         advdll_grid.o \
         advdll_gridctrl.o \
         advdll_gridsel.o \
         advdll_helpext.o \
         advdll_datavgen.o \
         advdll_datectlg.o \
         advdll_grid.o \
         advdll_gridctrl.o \
         advdll_gridsel.o \
         advdll_helpext.o \
-       advdll_hyperlink.o \
+       advdll_hyperlinkg.o \
         advdll_laywin.o \
         advdll_odcombo.o \
         advdll_propdlg.o \
         advdll_laywin.o \
         advdll_odcombo.o \
         advdll_propdlg.o \
@@ -10049,17 +10440,18 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_2 =  \
  COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_2 =  \
         advdll_animatecmn.o \
         advdll_datavcmn.o \
  COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_2 =  \
         advdll_animatecmn.o \
         advdll_datavcmn.o \
+       advdll_hyperlnkcmn.o \
         advdll_aboutdlgg.o \
         advdll_aboutdlgg.o \
+       advdll_animateg.o \
         advdll_bmpcboxg.o \
         advdll_calctrl.o \
         advdll_bmpcboxg.o \
         advdll_calctrl.o \
-       advdll_collpaneg.o \
         advdll_datavgen.o \
         advdll_datectlg.o \
         advdll_grid.o \
         advdll_gridctrl.o \
         advdll_gridsel.o \
         advdll_helpext.o \
         advdll_datavgen.o \
         advdll_datectlg.o \
         advdll_grid.o \
         advdll_gridctrl.o \
         advdll_gridsel.o \
         advdll_helpext.o \
-       advdll_hyperlink.o \
+       advdll_hyperlinkg.o \
         advdll_laywin.o \
         advdll_odcombo.o \
         advdll_propdlg.o \
         advdll_laywin.o \
         advdll_odcombo.o \
         advdll_propdlg.o \
@@ -10080,6 +10472,8 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__advlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__install_advlib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = install_advlib
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__advlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__install_advlib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = install_advlib
+@COND_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_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
@@ -10088,17 +10482,18 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \
  COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_3 =  \
         advlib_animatecmn.o \
         advlib_datavcmn.o \
  COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_3 =  \
         advlib_animatecmn.o \
         advlib_datavcmn.o \
+       advlib_hyperlnkcmn.o \
         advlib_aboutdlgg.o \
         advlib_aboutdlgg.o \
+       advlib_animateg.o \
         advlib_bmpcboxg.o \
         advlib_calctrl.o \
         advlib_bmpcboxg.o \
         advlib_calctrl.o \
-       advlib_collpaneg.o \
         advlib_datavgen.o \
         advlib_datectlg.o \
         advlib_grid.o \
         advlib_gridctrl.o \
         advlib_gridsel.o \
         advlib_helpext.o \
         advlib_datavgen.o \
         advlib_datectlg.o \
         advlib_grid.o \
         advlib_gridctrl.o \
         advlib_gridsel.o \
         advlib_helpext.o \
-       advlib_hyperlink.o \
+       advlib_hyperlinkg.o \
         advlib_laywin.o \
         advlib_odcombo.o \
         advlib_propdlg.o \
         advlib_laywin.o \
         advlib_odcombo.o \
         advlib_propdlg.o \
@@ -10112,17 +10507,18 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_3 =  \
  COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3 =  \
         advlib_animatecmn.o \
         advlib_datavcmn.o \
  COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3 =  \
         advlib_animatecmn.o \
         advlib_datavcmn.o \
+       advlib_hyperlnkcmn.o \
         advlib_aboutdlgg.o \
         advlib_aboutdlgg.o \
+       advlib_animateg.o \
         advlib_bmpcboxg.o \
         advlib_calctrl.o \
         advlib_bmpcboxg.o \
         advlib_calctrl.o \
-       advlib_collpaneg.o \
         advlib_datavgen.o \
         advlib_datectlg.o \
         advlib_grid.o \
         advlib_gridctrl.o \
         advlib_gridsel.o \
         advlib_helpext.o \
         advlib_datavgen.o \
         advlib_datectlg.o \
         advlib_grid.o \
         advlib_gridctrl.o \
         advlib_gridsel.o \
         advlib_helpext.o \
-       advlib_hyperlink.o \
+       advlib_hyperlinkg.o \
         advlib_laywin.o \
         advlib_odcombo.o \
         advlib_propdlg.o \
         advlib_laywin.o \
         advlib_odcombo.o \
         advlib_propdlg.o \
@@ -10138,11 +10534,15 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3 =  \
  @COND_TOOLKIT_WINCE@   = advlib_datectrl.o
  @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_3 \
  @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@   = advlib_sound_sdl.o
  @COND_TOOLKIT_WINCE@   = advlib_datectrl.o
  @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_3 \
  @COND_PLATFORM_UNIX_1_USE_PLUGINS_0@   = advlib_sound_sdl.o
+@COND_SHARED_1@____wxadv_namedll_DEP = $(__advdll___depname)
+@COND_SHARED_0@____wxadv_namelib_DEP = $(__advlib___depname)
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1___mediadll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@__mediadll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1___mediadll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@__install_mediadll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@     = install_mediadll
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1___mediadll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@__mediadll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1___mediadll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@__install_mediadll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@     = install_mediadll
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@__uninstall_mediadll___depname \
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@     = uninstall_mediadll
  COND_PLATFORM_MACOSX_1___mediadll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__mediadll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___mediadll___macinstnamecmd)
  COND_PLATFORM_MACOSX_1___mediadll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__mediadll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___mediadll___macinstnamecmd)
@@ -10150,7 +10550,7 @@ COND_PLATFORM_OS2_1___mediadll___importlib = -import \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__mediadll___importlib = $(COND_PLATFORM_OS2_1___mediadll___importlib)
  COND_WINDOWS_IMPLIB_1___mediadll___importlib = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__mediadll___importlib = $(COND_PLATFORM_OS2_1___mediadll___importlib)
  COND_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)
+       -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_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 \
@@ -10183,24 +10583,36 @@ COND_USE_SOSYMLINKS_1___mediadll___so_symlinks_inst_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)
  @COND_USE_SOSYMLINKS_1@__mediadll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___mediadll___so_symlinks_inst_cmd)
         $(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 \
+       $(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_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_MAC@__MEDIA_PLATFORM_SRC_OBJECTS_2 = mediadll_mediactrl.o
  @COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_2 = mediadll_mediactrl.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_MAC@__MEDIA_PLATFORM_SRC_OBJECTS_2 = mediadll_mediactrl.o
  @COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_2 = mediadll_mediactrl.o
-@COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS_2 = \
-@COND_TOOLKIT_MSW@     mediadll_mediactrl_am.o mediadll_mediactrl_wmp10.o \
-@COND_TOOLKIT_MSW@     mediadll_activex.o
+COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_2 =  \
+       mediadll_mediactrl_am.o \
+       mediadll_mediactrl_wmp10.o \
+       mediadll_mediactrl_qt.o \
+       mediadll_activex.o
+@COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___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 = \
-@COND_TOOLKIT_WINCE@   mediadll_mediactrl_am.o mediadll_mediactrl_wmp10.o \
-@COND_TOOLKIT_WINCE@   mediadll_activex.o
+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_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@__install_medialib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1@     = install_medialib
  @COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_2 = mediadll_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@__install_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_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_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
@@ -10210,19 +10622,29 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1___medialib___depname = \
  @COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_3 = medialib_mediactrl.o 
  @COND_TOOLKIT_MAC@__MEDIA_PLATFORM_SRC_OBJECTS_3 = medialib_mediactrl.o
  @COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_3 = medialib_mediactrl.o
  @COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_3 = medialib_mediactrl.o 
  @COND_TOOLKIT_MAC@__MEDIA_PLATFORM_SRC_OBJECTS_3 = medialib_mediactrl.o
  @COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_3 = medialib_mediactrl.o
-@COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS_3 = \
-@COND_TOOLKIT_MSW@     medialib_mediactrl_am.o medialib_mediactrl_wmp10.o \
-@COND_TOOLKIT_MSW@     medialib_activex.o
+COND_TOOLKIT_MSW___MEDIA_PLATFORM_SRC_OBJECTS_3 =  \
+       medialib_mediactrl_am.o \
+       medialib_mediactrl_wmp10.o \
+       medialib_mediactrl_qt.o \
+       medialib_activex.o
+@COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___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 = \
-@COND_TOOLKIT_WINCE@   medialib_mediactrl_am.o medialib_mediactrl_wmp10.o \
-@COND_TOOLKIT_WINCE@   medialib_activex.o
+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_X11@__MEDIA_PLATFORM_SRC_OBJECTS_3 = medialib_mediactrl.o
+@COND_SHARED_1@____wxmedia_namedll_DEP = $(__mediadll___depname)
+@COND_SHARED_0@____wxmedia_namelib_DEP = $(__medialib___depname)
  COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1___odbcdll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@__odbcdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1___odbcdll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@__install_odbcdll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        = install_odbcdll
  COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1___odbcdll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@__odbcdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1___odbcdll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@__install_odbcdll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        = install_odbcdll
+@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@__uninstall_odbcdll___depname \
+@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        = uninstall_odbcdll
  COND_PLATFORM_MACOSX_1___odbcdll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__odbcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___odbcdll___macinstnamecmd)
  COND_PLATFORM_MACOSX_1___odbcdll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__odbcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___odbcdll___macinstnamecmd)
@@ -10230,7 +10652,7 @@ COND_PLATFORM_OS2_1___odbcdll___importlib = -import \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__odbcdll___importlib = $(COND_PLATFORM_OS2_1___odbcdll___importlib)
  COND_WINDOWS_IMPLIB_1___odbcdll___importlib = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__odbcdll___importlib = $(COND_PLATFORM_OS2_1___odbcdll___importlib)
  COND_WINDOWS_IMPLIB_1___odbcdll___importlib = \
-       -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+       -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__odbcdll___importlib = $(COND_WINDOWS_IMPLIB_1___odbcdll___importlib)
  @COND_GCC_PCH_1@__odbcdll_PCH_INC = -I.pch/wxprec_odbcdll
  @COND_ICC_PCH_1@__odbcdll_PCH_INC = -use_pch \
  @COND_WINDOWS_IMPLIB_1@__odbcdll___importlib = $(COND_WINDOWS_IMPLIB_1___odbcdll___importlib)
  @COND_GCC_PCH_1@__odbcdll_PCH_INC = -I.pch/wxprec_odbcdll
  @COND_ICC_PCH_1@__odbcdll_PCH_INC = -use_pch \
@@ -10263,12 +10685,18 @@ COND_USE_SOSYMLINKS_1___odbcdll___so_symlinks_inst_cmd = rm -f \
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_USE_SOSYMLINKS_1@__odbcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___odbcdll___so_symlinks_inst_cmd)
         $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_USE_SOSYMLINKS_1@__odbcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___odbcdll___so_symlinks_inst_cmd)
+COND_USE_SOSYMLINKS_1___odbcdll___so_symlinks_uninst_cmd = rm -f \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOSYMLINKS_1@__odbcdll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___odbcdll___so_symlinks_uninst_cmd)
  @COND_PLATFORM_WIN32_1@__odbcdll___win32rc = odbcdll_version_rc.o
  COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1___odbclib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@__odbclib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1___odbclib___depname)
  @COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@__install_odbclib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        = install_odbclib
  @COND_PLATFORM_WIN32_1@__odbcdll___win32rc = odbcdll_version_rc.o
  COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1___odbclib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@__odbclib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1___odbclib___depname)
  @COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@__install_odbclib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        = install_odbclib
+@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@__uninstall_odbclib___depname \
+@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        = uninstall_odbclib
  @COND_GCC_PCH_1@__odbclib_PCH_INC = -I.pch/wxprec_odbclib
  @COND_ICC_PCH_1@__odbclib_PCH_INC = -use_pch \
  @COND_ICC_PCH_1@       .pch/wxprec_odbclib/wx/wxprec.h.gch
  @COND_GCC_PCH_1@__odbclib_PCH_INC = -I.pch/wxprec_odbclib
  @COND_ICC_PCH_1@__odbclib_PCH_INC = -use_pch \
  @COND_ICC_PCH_1@       .pch/wxprec_odbclib/wx/wxprec.h.gch
@@ -10279,6 +10707,8 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___dbgriddll___depname = \
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__dbgriddll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___dbgriddll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__install_dbgriddll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      = install_dbgriddll
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__dbgriddll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___dbgriddll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__install_dbgriddll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      = install_dbgriddll
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__uninstall_dbgriddll___depname \
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      = uninstall_dbgriddll
  COND_PLATFORM_MACOSX_1___dbgriddll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__dbgriddll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___dbgriddll___macinstnamecmd)
  COND_PLATFORM_MACOSX_1___dbgriddll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__dbgriddll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___dbgriddll___macinstnamecmd)
@@ -10286,7 +10716,7 @@ COND_PLATFORM_OS2_1___dbgriddll___importlib = -import \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__dbgriddll___importlib = $(COND_PLATFORM_OS2_1___dbgriddll___importlib)
  COND_WINDOWS_IMPLIB_1___dbgriddll___importlib = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__dbgriddll___importlib = $(COND_PLATFORM_OS2_1___dbgriddll___importlib)
  COND_WINDOWS_IMPLIB_1___dbgriddll___importlib = \
-       -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+       -Wl,--out-implib=$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_WINDOWS_IMPLIB_1@__dbgriddll___importlib = $(COND_WINDOWS_IMPLIB_1___dbgriddll___importlib)
  @COND_GCC_PCH_1@__dbgriddll_PCH_INC = -I.pch/wxprec_dbgriddll
  @COND_ICC_PCH_1@__dbgriddll_PCH_INC = -use_pch \
  @COND_WINDOWS_IMPLIB_1@__dbgriddll___importlib = $(COND_WINDOWS_IMPLIB_1___dbgriddll___importlib)
  @COND_GCC_PCH_1@__dbgriddll_PCH_INC = -I.pch/wxprec_dbgriddll
  @COND_ICC_PCH_1@__dbgriddll_PCH_INC = -use_pch \
@@ -10319,22 +10749,32 @@ COND_USE_SOSYMLINKS_1___dbgriddll___so_symlinks_inst_cmd = rm -f \
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_USE_SOSYMLINKS_1@__dbgriddll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___dbgriddll___so_symlinks_inst_cmd)
         $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
         $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_USE_SOSYMLINKS_1@__dbgriddll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___dbgriddll___so_symlinks_inst_cmd)
+COND_USE_SOSYMLINKS_1___dbgriddll___so_symlinks_uninst_cmd = rm -f \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOSYMLINKS_1@__dbgriddll___so_symlinks_uninst_cmd = $(COND_USE_SOSYMLINKS_1___dbgriddll___so_symlinks_uninst_cmd)
  @COND_PLATFORM_WIN32_1@__dbgriddll___win32rc = dbgriddll_version_rc.o
  COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___dbgridlib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@__dbgridlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___dbgridlib___depname)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@__install_dbgridlib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      = install_dbgridlib
  @COND_PLATFORM_WIN32_1@__dbgriddll___win32rc = dbgriddll_version_rc.o
  COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___dbgridlib___depname = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@__dbgridlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___dbgridlib___depname)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@__install_dbgridlib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      = install_dbgridlib
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@__uninstall_dbgridlib___depname \
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      = uninstall_dbgridlib
  @COND_GCC_PCH_1@__dbgridlib_PCH_INC = -I.pch/wxprec_dbgridlib
  @COND_ICC_PCH_1@__dbgridlib_PCH_INC = -use_pch \
  @COND_ICC_PCH_1@       .pch/wxprec_dbgridlib/wx/wxprec.h.gch
  @COND_USE_PCH_1@___pch_wxprec_dbgridlib_wx_wxprec_h_gch___depname \
  @COND_USE_PCH_1@       = .pch/wxprec_dbgridlib/wx/wxprec.h.gch
  @COND_GCC_PCH_1@__dbgridlib_PCH_INC = -I.pch/wxprec_dbgridlib
  @COND_ICC_PCH_1@__dbgridlib_PCH_INC = -use_pch \
  @COND_ICC_PCH_1@       .pch/wxprec_dbgridlib/wx/wxprec.h.gch
  @COND_USE_PCH_1@___pch_wxprec_dbgridlib_wx_wxprec_h_gch___depname \
  @COND_USE_PCH_1@       = .pch/wxprec_dbgridlib/wx/wxprec.h.gch
+@COND_SHARED_1@____wxdbgrid_namedll_DEP = $(__dbgriddll___depname)
+@COND_SHARED_0@____wxdbgrid_namelib_DEP = $(__dbgridlib___depname)
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__htmldll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__install_htmldll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      = install_htmldll
  COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__htmldll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__install_htmldll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      = install_htmldll
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@__uninstall_htmldll___depname \
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      = uninstall_htmldll
  COND_PLATFORM_MACOSX_1___htmldll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__htmldll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___htmldll___macinstnamecmd)
  COND_PLATFORM_MACOSX_1___htmldll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__htmldll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___htmldll___macinstnamecmd)
@@ -10342,7 +10782,7 @@ COND_PLATFORM_OS2_1___htmldll___importlib = -import \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__htmldll___importlib = $(COND_PLATFORM_OS2_1___htmldll___importlib)
  COND_WINDOWS_IMPLIB_1___htmldll___importlib = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__htmldll___importlib = $(COND_PLATFORM_OS2_1___htmldll___importlib)
  COND_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)
+       -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_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 \
@@ -10375,6 +10815,10 @@ COND_USE_SOSYMLINKS_1___htmldll___so_symlinks_inst_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)
  @COND_USE_SOSYMLINKS_1@__htmldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___htmldll___so_symlinks_inst_cmd)
         $(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 \
+       $(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_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
@@ -10384,6 +10828,8 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1___htmllib___depname = \
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@__htmllib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1___htmllib___depname)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@__install_htmllib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@      = install_htmllib
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@__htmllib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1___htmllib___depname)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@__install_htmllib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@      = install_htmllib
+@COND_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_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
@@ -10392,11 +10838,15 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1___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_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_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@__install_qadll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@        = install_qadll
  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@__install_qadll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@        = install_qadll
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@__uninstall_qadll___depname \
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@        = uninstall_qadll
  COND_PLATFORM_MACOSX_1___qadll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__qadll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___qadll___macinstnamecmd)
  COND_PLATFORM_MACOSX_1___qadll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__qadll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___qadll___macinstnamecmd)
@@ -10404,7 +10854,7 @@ COND_PLATFORM_OS2_1___qadll___importlib = -import \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__qadll___importlib = $(COND_PLATFORM_OS2_1___qadll___importlib)
  COND_WINDOWS_IMPLIB_1___qadll___importlib = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__qadll___importlib = $(COND_PLATFORM_OS2_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)
+       -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_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 \
@@ -10437,21 +10887,30 @@ COND_USE_SOSYMLINKS_1___qadll___so_symlinks_inst_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)
  @COND_USE_SOSYMLINKS_1@__qadll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___qadll___so_symlinks_inst_cmd)
         $(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 \
+       $(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_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_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@__qalib___depname = $(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___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@        = install_qalib
  @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_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1@__qalib___depname = $(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___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_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 = -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_SHARED_1@____wxqa_namedll_DEP = $(__qadll___depname)
+@COND_SHARED_0@____wxqa_namelib_DEP = $(__qalib___depname)
  COND_MONOLITHIC_0_SHARED_1___xmldll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1@__xmldll___depname = $(COND_MONOLITHIC_0_SHARED_1___xmldll___depname)
  @COND_MONOLITHIC_0_SHARED_1@__install_xmldll___depname = install_xmldll
  COND_MONOLITHIC_0_SHARED_1___xmldll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1@__xmldll___depname = $(COND_MONOLITHIC_0_SHARED_1___xmldll___depname)
  @COND_MONOLITHIC_0_SHARED_1@__install_xmldll___depname = install_xmldll
+@COND_MONOLITHIC_0_SHARED_1@__uninstall_xmldll___depname = uninstall_xmldll
  COND_PLATFORM_MACOSX_1___xmldll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__xmldll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___xmldll___macinstnamecmd)
  COND_PLATFORM_MACOSX_1___xmldll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__xmldll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___xmldll___macinstnamecmd)
@@ -10459,7 +10918,7 @@ COND_PLATFORM_OS2_1___xmldll___importlib = -import \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__xmldll___importlib = $(COND_PLATFORM_OS2_1___xmldll___importlib)
  COND_WINDOWS_IMPLIB_1___xmldll___importlib = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__xmldll___importlib = $(COND_PLATFORM_OS2_1___xmldll___importlib)
  COND_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)
+       -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_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 \
@@ -10492,21 +10951,30 @@ COND_USE_SOSYMLINKS_1___xmldll___so_symlinks_inst_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)
  @COND_USE_SOSYMLINKS_1@__xmldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___xmldll___so_symlinks_inst_cmd)
         $(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 \
+       $(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_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_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 = -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_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 = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@__xrcdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_XRC_1___xrcdll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@__install_xrcdll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ = install_xrcdll
  COND_MONOLITHIC_0_SHARED_1_USE_XRC_1___xrcdll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@__xrcdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_XRC_1___xrcdll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@__install_xrcdll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ = install_xrcdll
+@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@__uninstall_xrcdll___depname \
+@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ = uninstall_xrcdll
  COND_PLATFORM_MACOSX_1___xrcdll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__xrcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___xrcdll___macinstnamecmd)
  COND_PLATFORM_MACOSX_1___xrcdll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__xrcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___xrcdll___macinstnamecmd)
@@ -10514,7 +10982,7 @@ COND_PLATFORM_OS2_1___xrcdll___importlib = -import \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__xrcdll___importlib = $(COND_PLATFORM_OS2_1___xrcdll___importlib)
  COND_WINDOWS_IMPLIB_1___xrcdll___importlib = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__xrcdll___importlib = $(COND_PLATFORM_OS2_1___xrcdll___importlib)
  COND_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)
+       -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_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 \
@@ -10547,22 +11015,32 @@ COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_inst_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)
  @COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_inst_cmd)
         $(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 \
+       $(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_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_MONOLITHIC_0_SHARED_0_USE_XRC_1@__xrclib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_XRC_1___xrclib___depname)
  @COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@__install_xrclib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ = install_xrclib
  @COND_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_MONOLITHIC_0_SHARED_0_USE_XRC_1@__xrclib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_XRC_1___xrclib___depname)
  @COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@__install_xrclib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ = install_xrclib
+@COND_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 = -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_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 = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@__auidll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_AUI_1___auidll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@__install_auidll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ = install_auidll
  COND_MONOLITHIC_0_SHARED_1_USE_AUI_1___auidll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@__auidll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_AUI_1___auidll___depname)
  @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@__install_auidll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ = install_auidll
+@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@__uninstall_auidll___depname \
+@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ = uninstall_auidll
  COND_PLATFORM_MACOSX_1___auidll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__auidll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___auidll___macinstnamecmd)
  COND_PLATFORM_MACOSX_1___auidll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__auidll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___auidll___macinstnamecmd)
@@ -10570,7 +11048,7 @@ COND_PLATFORM_OS2_1___auidll___importlib = -import \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__auidll___importlib = $(COND_PLATFORM_OS2_1___auidll___importlib)
  COND_WINDOWS_IMPLIB_1___auidll___importlib = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__auidll___importlib = $(COND_PLATFORM_OS2_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)
+       -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_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 \
@@ -10603,22 +11081,32 @@ COND_USE_SOSYMLINKS_1___auidll___so_symlinks_inst_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)
  @COND_USE_SOSYMLINKS_1@__auidll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___auidll___so_symlinks_inst_cmd)
         $(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 \
+       $(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_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_MONOLITHIC_0_SHARED_0_USE_AUI_1@__auilib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_AUI_1___auilib___depname)
  @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@__install_auilib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@ = install_auilib
  @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_MONOLITHIC_0_SHARED_0_USE_AUI_1@__auilib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_AUI_1___auilib___depname)
  @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@__install_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_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 = -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_SHARED_1@____wxaui_namedll_DEP = $(__auidll___depname)
+@COND_SHARED_0@____wxaui_namelib_DEP = $(__auilib___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@__install_richtextdll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@    = install_richtextdll
  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@__install_richtextdll___depname \
  @COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@    = install_richtextdll
+@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@__uninstall_richtextdll___depname \
+@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@    = uninstall_richtextdll
  COND_PLATFORM_MACOSX_1___richtextdll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__richtextdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___richtextdll___macinstnamecmd)
  COND_PLATFORM_MACOSX_1___richtextdll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__richtextdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___richtextdll___macinstnamecmd)
@@ -10626,7 +11114,7 @@ COND_PLATFORM_OS2_1___richtextdll___importlib = -import \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__richtextdll___importlib = $(COND_PLATFORM_OS2_1___richtextdll___importlib)
  COND_WINDOWS_IMPLIB_1___richtextdll___importlib = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__richtextdll___importlib = $(COND_PLATFORM_OS2_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)
+       -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_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 \
@@ -10660,22 +11148,98 @@ COND_USE_SOSYMLINKS_1___richtextdll___so_symlinks_inst_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)
  @COND_USE_SOSYMLINKS_1@__richtextdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___richtextdll___so_symlinks_inst_cmd)
         $(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 \
+       $(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_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_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@__richtextlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1___richtextlib___depname)
  @COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@__install_richtextlib___depname \
  @COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@    = install_richtextlib
  @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_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@__richtextlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1___richtextlib___depname)
  @COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@__install_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_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 = -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_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 = \
+       $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@__stcdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_STC_1___stcdll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@__install_stcdll___depname \
+@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ = install_stcdll
+@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@__uninstall_stcdll___depname \
+@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ = uninstall_stcdll
+COND_PLATFORM_MACOSX_1___stcdll___macinstnamecmd = -install_name \
+       $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_PLATFORM_MACOSX_1@__stcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___stcdll___macinstnamecmd)
+COND_PLATFORM_OS2_1___stcdll___importlib = -import \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_PLATFORM_OS2_1@__stcdll___importlib = $(COND_PLATFORM_OS2_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_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 \
+       $(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) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(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 \
+       $(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) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(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 \
+       $(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_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_MONOLITHIC_0_SHARED_0_USE_STC_1@__stclib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_STC_1___stclib___depname)
+@COND_MONOLITHIC_0_SHARED_0_USE_STC_1@__install_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_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_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 = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@__gldll___depname = $(COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname)
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@__install_gldll___depname \
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ = install_gldll
  COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname = \
         $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@__gldll___depname = $(COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname)
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@__install_gldll___depname \
  @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ = install_gldll
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@__uninstall_gldll___depname \
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ = uninstall_gldll
  COND_PLATFORM_MACOSX_1___gldll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__gldll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___gldll___macinstnamecmd)
  COND_PLATFORM_MACOSX_1___gldll___macinstnamecmd = -install_name \
         $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
  @COND_PLATFORM_MACOSX_1@__gldll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___gldll___macinstnamecmd)
@@ -10683,7 +11247,7 @@ COND_PLATFORM_OS2_1___gldll___importlib = -import \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__gldll___importlib = $(COND_PLATFORM_OS2_1___gldll___importlib)
  COND_WINDOWS_IMPLIB_1___gldll___importlib = \
         $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
  @COND_PLATFORM_OS2_1@__gldll___importlib = $(COND_PLATFORM_OS2_1___gldll___importlib)
  COND_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)
+       -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_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 \
@@ -10716,16 +11280,22 @@ COND_USE_SOSYMLINKS_1___gldll___so_symlinks_inst_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)
  @COND_USE_SOSYMLINKS_1@__gldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___gldll___so_symlinks_inst_cmd)
         $(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 \
+       $(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_PLATFORM_WIN32_1@__gldll___win32rc = gldll_version_rc.o
  @COND_PLATFORM_WIN32_1@__gldll___win32rc = gldll_version_rc.o
-@COND_TOOLKIT_COCOA@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
-@COND_TOOLKIT_MAC@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
-@COND_TOOLKIT_MOTIF@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
-@COND_TOOLKIT_MSW@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
-@COND_TOOLKIT_PM@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
-@COND_TOOLKIT_WINCE@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
-@COND_TOOLKIT_X11@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
+@COND_TOOLKIT_COCOA@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_glcanvas.o
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__OPENGL_SRC_PLATFORM_OBJECTS \
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    = gldll_glcanvas.o
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__OPENGL_SRC_PLATFORM_OBJECTS \
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   = gldll_glcanvas.o
+@COND_TOOLKIT_MAC@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_glcanvas.o
+@COND_TOOLKIT_MOTIF@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_glcanvas.o
+@COND_TOOLKIT_MSW@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_glcanvas.o
+@COND_TOOLKIT_PM@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_glcanvas.o
+@COND_TOOLKIT_WINCE@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_glcanvas.o
+@COND_TOOLKIT_X11@__OPENGL_SRC_PLATFORM_OBJECTS = gldll_glcanvas.o
  COND_MONOLITHIC_0___WXLIBGLDEP_CORE_p = \
         -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
  @COND_MONOLITHIC_0@__WXLIBGLDEP_CORE_p = $(COND_MONOLITHIC_0___WXLIBGLDEP_CORE_p)
  COND_MONOLITHIC_0___WXLIBGLDEP_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)
@@ -10740,49 +11310,57 @@ COND_SHARED_0_USE_GUI_1_USE_OPENGL_1___gllib___depname = \
  @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@__gllib___depname = $(COND_SHARED_0_USE_GUI_1_USE_OPENGL_1___gllib___depname)
  @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@__install_gllib___depname \
  @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ = install_gllib
  @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@__gllib___depname = $(COND_SHARED_0_USE_GUI_1_USE_OPENGL_1___gllib___depname)
  @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@__install_gllib___depname \
  @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ = install_gllib
+@COND_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_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_OBJECTS_1 = gllib_glcanvas.o
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__OPENGL_SRC_OBJECTS_1 \
+@COND_TOOLKIT_COCOA@__OPENGL_SRC_PLATFORM_OBJECTS_1 = gllib_glcanvas.o
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__OPENGL_SRC_PLATFORM_OBJECTS_1 \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    = gllib_glcanvas.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    = gllib_glcanvas.o
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__OPENGL_SRC_OBJECTS_1 \
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__OPENGL_SRC_PLATFORM_OBJECTS_1 \
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   = gllib_glcanvas.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   = gllib_glcanvas.o
-@COND_TOOLKIT_MAC@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
-@COND_TOOLKIT_MOTIF@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
-@COND_TOOLKIT_MSW@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
-@COND_TOOLKIT_PM@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
-@COND_TOOLKIT_WINCE@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
-@COND_TOOLKIT_X11@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
+@COND_TOOLKIT_MAC@__OPENGL_SRC_PLATFORM_OBJECTS_1 = gllib_glcanvas.o
+@COND_TOOLKIT_MOTIF@__OPENGL_SRC_PLATFORM_OBJECTS_1 = gllib_glcanvas.o
+@COND_TOOLKIT_MSW@__OPENGL_SRC_PLATFORM_OBJECTS_1 = gllib_glcanvas.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_X11@__OPENGL_SRC_PLATFORM_OBJECTS_1 = gllib_glcanvas.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 = \
         $(DLLPREFIX_MODULE)sound_sdl$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
  @COND_WITH_PLUGIN_SDL_1@__sound_sdl___depname = $(COND_WITH_PLUGIN_SDL_1___sound_sdl___depname)
  @COND_WITH_PLUGIN_SDL_1@__install_sound_sdl___depname = install_sound_sdl
  COND_WITH_PLUGIN_SDL_1___sound_sdl___depname = \
         $(DLLPREFIX_MODULE)sound_sdl$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
  @COND_WITH_PLUGIN_SDL_1@__sound_sdl___depname = $(COND_WITH_PLUGIN_SDL_1___sound_sdl___depname)
  @COND_WITH_PLUGIN_SDL_1@__install_sound_sdl___depname = install_sound_sdl
+@COND_WITH_PLUGIN_SDL_1@__uninstall_sound_sdl___depname \
+@COND_WITH_PLUGIN_SDL_1@       = uninstall_sound_sdl
  @COND_USE_XRC_1@__wxrc___depname = wxrc
  @COND_USE_XRC_1@__clean_wxrc___depname = clean-wxrc
  @COND_USE_XRC_1@__install_wxrc___depname = install-wxrc
  @COND_TOOLKIT_MSW@RCDEFS_H = msw/rcdefs.h
  @COND_USE_XRC_1@__wxrc___depname = wxrc
  @COND_USE_XRC_1@__clean_wxrc___depname = clean-wxrc
  @COND_USE_XRC_1@__install_wxrc___depname = install-wxrc
  @COND_TOOLKIT_MSW@RCDEFS_H = msw/rcdefs.h
-@COND_TOOLKIT_COCOA@__cocoa_res___depname = lib/libwx_$(TOOLCHAIN_NAME).1.r
+@COND_TOOLKIT_COCOA@__cocoa_res___depname = lib/libwx_$(TOOLCHAIN_NAME).0.r
  @COND_TOOLKIT_COCOA@__cocoa_res_install___depname = cocoa-res-install
  @COND_SHARED_0@____SHARED = 
  @COND_SHARED_1@____SHARED = $(PIC_FLAG)
  @COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS \
  @COND_PLATFORM_MACOSX_1@       = monodll_gsockosx.o monodll_hid.o \
  @COND_PLATFORM_MACOSX_1@       monodll_utilsexc_cf.o
  @COND_TOOLKIT_COCOA@__cocoa_res_install___depname = cocoa-res-install
  @COND_SHARED_0@____SHARED = 
  @COND_SHARED_1@____SHARED = $(PIC_FLAG)
  @COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS \
  @COND_PLATFORM_MACOSX_1@       = monodll_gsockosx.o monodll_hid.o \
  @COND_PLATFORM_MACOSX_1@       monodll_utilsexc_cf.o
-COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS =  \
-       monodll_animateg.o \
-       monodll_taskbar.o \
+COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS =  \
         monodll_taskbarcmn.o \
         monodll_taskbarcmn.o \
-       monodll_hidjoystick.o
-@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS)
+       monodll_joystick.o \
+       monodll_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 = \
+@COND_TOOLKIT_COCOA@   monodll_taskbar.o monodll_taskbarcmn.o \
+@COND_TOOLKIT_COCOA@   monodll_hidjoystick.o
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS =  \
         monodll_taskbarcmn.o \
         monodll_joystick.o \
         monodll_sound.o \
         monodll_taskbarx11.o \
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS =  \
         monodll_taskbarcmn.o \
         monodll_joystick.o \
         monodll_sound.o \
         monodll_taskbarx11.o \
-       monodll_animateg.o \
         monodll_eggtrayicon.o \
         monodll_taskbar.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS)
         monodll_eggtrayicon.o \
         monodll_taskbar.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS)
@@ -10791,16 +11369,14 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS =  \
         monodll_joystick.o \
         monodll_sound.o \
         monodll_taskbarx11.o \
         monodll_joystick.o \
         monodll_sound.o \
         monodll_taskbarx11.o \
-       monodll_animateg.o \
         monodll_aboutdlg.o \
         monodll_animate.o \
         monodll_aboutdlg.o \
         monodll_animate.o \
-       monodll_collpane.o \
         monodll_dataview.o \
         monodll_dataview.o \
+       monodll_hyperlink.o \
         monodll_taskbar.o \
         monodll_eggtrayicon.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS)
  COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS =  \
         monodll_taskbar.o \
         monodll_eggtrayicon.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS)
  COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS =  \
-       monodll_animateg.o \
         monodll_taskbarcmn.o \
         monodll_aboutdlg.o \
         monodll_drawer.o \
         monodll_taskbarcmn.o \
         monodll_aboutdlg.o \
         monodll_drawer.o \
@@ -10812,11 +11388,9 @@ COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS =  \
         monodll_taskbarcmn.o \
         monodll_joystick.o \
         monodll_sound.o \
         monodll_taskbarcmn.o \
         monodll_joystick.o \
         monodll_sound.o \
-       monodll_taskbarx11.o \
-       monodll_animateg.o
+       monodll_taskbarx11.o
  @COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS)
  COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS =  \
  @COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS)
  COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS =  \
-       monodll_animateg.o \
         monodll_taskbarcmn.o \
         monodll_aboutdlg.o \
         monodll_sound.o \
         monodll_taskbarcmn.o \
         monodll_aboutdlg.o \
         monodll_sound.o \
@@ -10824,36 +11398,33 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS =  \
         monodll_joystick.o
  @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS)
  @COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS = \
         monodll_joystick.o
  @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_MSW___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_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS =  \
-       monodll_animateg.o \
-       monodll_taskbarcmn.o \
-       monodll_aboutdlg.o \
-       monodll_sound.o \
-       monodll_taskbar.o
-@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS)
+@COND_TOOLKIT_PM@      monodll_joystick.o monodll_sound.o
+@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS = \
+@COND_TOOLKIT_WINCE@   monodll_taskbarcmn.o monodll_aboutdlg.o \
+@COND_TOOLKIT_WINCE@   monodll_sound.o monodll_taskbar.o
  COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS =  \
         monodll_taskbarcmn.o \
         monodll_joystick.o \
         monodll_sound.o \
  COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS =  \
         monodll_taskbarcmn.o \
         monodll_joystick.o \
         monodll_sound.o \
-       monodll_taskbarx11.o \
-       monodll_animateg.o
+       monodll_taskbarx11.o
  @COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS)
  @COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS_0 \
  @COND_PLATFORM_MACOSX_1@       = monolib_gsockosx.o monolib_hid.o \
  @COND_PLATFORM_MACOSX_1@       monolib_utilsexc_cf.o
  @COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS)
  @COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS_0 \
  @COND_PLATFORM_MACOSX_1@       = monolib_gsockosx.o monolib_hid.o \
  @COND_PLATFORM_MACOSX_1@       monolib_utilsexc_cf.o
-COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
-       monolib_animateg.o \
-       monolib_taskbar.o \
+COND_PLATFORM_UNIX_1_TOOLKIT_MGL___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
         monolib_taskbarcmn.o \
         monolib_taskbarcmn.o \
-       monolib_hidjoystick.o
-@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_0)
+       monolib_joystick.o \
+       monolib_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 = \
+@COND_TOOLKIT_COCOA@   monolib_taskbar.o monolib_taskbarcmn.o \
+@COND_TOOLKIT_COCOA@   monolib_hidjoystick.o
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
         monolib_taskbarcmn.o \
         monolib_joystick.o \
         monolib_sound.o \
         monolib_taskbarx11.o \
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
         monolib_taskbarcmn.o \
         monolib_joystick.o \
         monolib_sound.o \
         monolib_taskbarx11.o \
-       monolib_animateg.o \
         monolib_eggtrayicon.o \
         monolib_taskbar.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_0)
         monolib_eggtrayicon.o \
         monolib_taskbar.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_0)
@@ -10862,16 +11433,14 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
         monolib_joystick.o \
         monolib_sound.o \
         monolib_taskbarx11.o \
         monolib_joystick.o \
         monolib_sound.o \
         monolib_taskbarx11.o \
-       monolib_animateg.o \
         monolib_aboutdlg.o \
         monolib_animate.o \
         monolib_aboutdlg.o \
         monolib_animate.o \
-       monolib_collpane.o \
         monolib_dataview.o \
         monolib_dataview.o \
+       monolib_hyperlink.o \
         monolib_taskbar.o \
         monolib_eggtrayicon.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_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
         monolib_taskbar.o \
         monolib_eggtrayicon.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_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
-       monolib_animateg.o \
         monolib_taskbarcmn.o \
         monolib_aboutdlg.o \
         monolib_drawer.o \
         monolib_taskbarcmn.o \
         monolib_aboutdlg.o \
         monolib_drawer.o \
@@ -10883,11 +11452,9 @@ COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
         monolib_taskbarcmn.o \
         monolib_joystick.o \
         monolib_sound.o \
         monolib_taskbarcmn.o \
         monolib_joystick.o \
         monolib_sound.o \
-       monolib_taskbarx11.o \
-       monolib_animateg.o
+       monolib_taskbarx11.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 =  \
  @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_animateg.o \
         monolib_taskbarcmn.o \
         monolib_aboutdlg.o \
         monolib_sound.o \
         monolib_taskbarcmn.o \
         monolib_aboutdlg.o \
         monolib_sound.o \
@@ -10895,20 +11462,15 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
         monolib_joystick.o
  @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_0)
  @COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
         monolib_joystick.o
  @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_MSW___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_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
-       monolib_animateg.o \
-       monolib_taskbarcmn.o \
-       monolib_aboutdlg.o \
-       monolib_sound.o \
-       monolib_taskbar.o
-@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_0)
+@COND_TOOLKIT_PM@      monolib_joystick.o monolib_sound.o
+@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
+@COND_TOOLKIT_WINCE@   monolib_taskbarcmn.o monolib_aboutdlg.o \
+@COND_TOOLKIT_WINCE@   monolib_sound.o monolib_taskbar.o
  COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
         monolib_taskbarcmn.o \
         monolib_joystick.o \
         monolib_sound.o \
  COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
         monolib_taskbarcmn.o \
         monolib_joystick.o \
         monolib_sound.o \
-       monolib_taskbarx11.o \
-       monolib_animateg.o
+       monolib_taskbarx11.o
  @COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_0)
  @COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS_8 \
  @COND_PLATFORM_MACOSX_1@       = coredll_gsockosx.o coredll_hid.o \
  @COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_0 = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_0)
  @COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS_8 \
  @COND_PLATFORM_MACOSX_1@       = coredll_gsockosx.o coredll_hid.o \
@@ -10916,18 +11478,17 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_0 =  \
  @COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS_9 \
  @COND_PLATFORM_MACOSX_1@       = corelib_gsockosx.o corelib_hid.o \
  @COND_PLATFORM_MACOSX_1@       corelib_utilsexc_cf.o
  @COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS_9 \
  @COND_PLATFORM_MACOSX_1@       = corelib_gsockosx.o corelib_hid.o \
  @COND_PLATFORM_MACOSX_1@       corelib_utilsexc_cf.o
-COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
-       advdll_animateg.o \
-       advdll_taskbar.o \
-       advdll_taskbarcmn.o \
-       advdll_hidjoystick.o
-@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_8)
+@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_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
+@COND_TOOLKIT_COCOA@   advdll_taskbar.o advdll_taskbarcmn.o \
+@COND_TOOLKIT_COCOA@   advdll_hidjoystick.o
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
         advdll_taskbarcmn.o \
         advdll_joystick.o \
         advdll_sound.o \
         advdll_taskbarx11.o \
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
         advdll_taskbarcmn.o \
         advdll_joystick.o \
         advdll_sound.o \
         advdll_taskbarx11.o \
-       advdll_animateg.o \
         advdll_eggtrayicon.o \
         advdll_taskbar.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_8)
         advdll_eggtrayicon.o \
         advdll_taskbar.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_8)
@@ -10936,16 +11497,14 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
         advdll_joystick.o \
         advdll_sound.o \
         advdll_taskbarx11.o \
         advdll_joystick.o \
         advdll_sound.o \
         advdll_taskbarx11.o \
-       advdll_animateg.o \
         advdll_aboutdlg.o \
         advdll_animate.o \
         advdll_aboutdlg.o \
         advdll_animate.o \
-       advdll_collpane.o \
         advdll_dataview.o \
         advdll_dataview.o \
+       advdll_hyperlink.o \
         advdll_taskbar.o \
         advdll_eggtrayicon.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_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
         advdll_taskbar.o \
         advdll_eggtrayicon.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_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
-       advdll_animateg.o \
         advdll_taskbarcmn.o \
         advdll_aboutdlg.o \
         advdll_drawer.o \
         advdll_taskbarcmn.o \
         advdll_aboutdlg.o \
         advdll_drawer.o \
@@ -10953,15 +11512,10 @@ COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
         advdll_taskbar.o \
         advdll_hidjoystick.o
  @COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_8)
         advdll_taskbar.o \
         advdll_hidjoystick.o
  @COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_8)
-COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
-       advdll_taskbarcmn.o \
-       advdll_joystick.o \
-       advdll_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_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
+@COND_TOOLKIT_MOTIF@   advdll_taskbarcmn.o advdll_joystick.o advdll_sound.o \
+@COND_TOOLKIT_MOTIF@   advdll_taskbarx11.o
  COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
  COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
-       advdll_animateg.o \
         advdll_taskbarcmn.o \
         advdll_aboutdlg.o \
         advdll_sound.o \
         advdll_taskbarcmn.o \
         advdll_aboutdlg.o \
         advdll_sound.o \
@@ -10969,33 +11523,24 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
         advdll_joystick.o
  @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_8)
  @COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
         advdll_joystick.o
  @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_MSW___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_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
-       advdll_animateg.o \
-       advdll_taskbarcmn.o \
-       advdll_aboutdlg.o \
-       advdll_sound.o \
-       advdll_taskbar.o
-@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_8)
-COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_8 =  \
-       advdll_taskbarcmn.o \
-       advdll_joystick.o \
-       advdll_sound.o \
-       advdll_taskbarx11.o \
-       advdll_animateg.o
-@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_8)
-COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
-       advlib_animateg.o \
-       advlib_taskbar.o \
-       advlib_taskbarcmn.o \
-       advlib_hidjoystick.o
-@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_9)
+@COND_TOOLKIT_PM@      advdll_joystick.o advdll_sound.o
+@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
+@COND_TOOLKIT_WINCE@   advdll_taskbarcmn.o advdll_aboutdlg.o advdll_sound.o \
+@COND_TOOLKIT_WINCE@   advdll_taskbar.o
+@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_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
+@COND_TOOLKIT_COCOA@   advlib_taskbar.o advlib_taskbarcmn.o \
+@COND_TOOLKIT_COCOA@   advlib_hidjoystick.o
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
         advlib_taskbarcmn.o \
         advlib_joystick.o \
         advlib_sound.o \
         advlib_taskbarx11.o \
  COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
         advlib_taskbarcmn.o \
         advlib_joystick.o \
         advlib_sound.o \
         advlib_taskbarx11.o \
-       advlib_animateg.o \
         advlib_eggtrayicon.o \
         advlib_taskbar.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_9)
         advlib_eggtrayicon.o \
         advlib_taskbar.o
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____ADVANCED_PLATFORM_SRC_OBJECTS_9)
@@ -11004,16 +11549,14 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
         advlib_joystick.o \
         advlib_sound.o \
         advlib_taskbarx11.o \
         advlib_joystick.o \
         advlib_sound.o \
         advlib_taskbarx11.o \
-       advlib_animateg.o \
         advlib_aboutdlg.o \
         advlib_animate.o \
         advlib_aboutdlg.o \
         advlib_animate.o \
-       advlib_collpane.o \
         advlib_dataview.o \
         advlib_dataview.o \
+       advlib_hyperlink.o \
         advlib_taskbar.o \
         advlib_eggtrayicon.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_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
         advlib_taskbar.o \
         advlib_eggtrayicon.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_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
-       advlib_animateg.o \
         advlib_taskbarcmn.o \
         advlib_aboutdlg.o \
         advlib_drawer.o \
         advlib_taskbarcmn.o \
         advlib_aboutdlg.o \
         advlib_drawer.o \
@@ -11021,15 +11564,10 @@ COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
         advlib_taskbar.o \
         advlib_hidjoystick.o
  @COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_9)
         advlib_taskbar.o \
         advlib_hidjoystick.o
  @COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_9)
-COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
-       advlib_taskbarcmn.o \
-       advlib_joystick.o \
-       advlib_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_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
+@COND_TOOLKIT_MOTIF@   advlib_taskbarcmn.o advlib_joystick.o advlib_sound.o \
+@COND_TOOLKIT_MOTIF@   advlib_taskbarx11.o
  COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
  COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
-       advlib_animateg.o \
         advlib_taskbarcmn.o \
         advlib_aboutdlg.o \
         advlib_sound.o \
         advlib_taskbarcmn.o \
         advlib_aboutdlg.o \
         advlib_sound.o \
@@ -11037,37 +11575,51 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
         advlib_joystick.o
  @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_9)
  @COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
         advlib_joystick.o
  @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_MSW___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_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
-       advlib_animateg.o \
-       advlib_taskbarcmn.o \
-       advlib_aboutdlg.o \
-       advlib_sound.o \
-       advlib_taskbar.o
-@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_9)
-COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_9 =  \
-       advlib_taskbarcmn.o \
-       advlib_joystick.o \
-       advlib_sound.o \
-       advlib_taskbarx11.o \
-       advlib_animateg.o
-@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_9)
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_58 = --define __WXUNIVERSAL__
-@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_57 = --define wxNO_EXCEPTIONS
-@COND_USE_RTTI_0@__RTTI_DEFINE_p_57 = --define wxNO_RTTI
-@COND_USE_THREADS_0@__THREAD_DEFINE_p_57 = --define wxNO_THREADS
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).1
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .1.$(SO_SUFFIX)
+@COND_TOOLKIT_PM@      advlib_joystick.o advlib_sound.o
+@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
+@COND_TOOLKIT_WINCE@   advlib_taskbarcmn.o advlib_aboutdlg.o advlib_sound.o \
+@COND_TOOLKIT_WINCE@   advlib_taskbar.o
+@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_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@      = -L$(LIBDIRNAME)
+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_62 = --define __WXUNIVERSAL__
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_61 = --define wxNO_EXCEPTIONS
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_61 = --define wxNO_RTTI
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_61 = --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_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).1.0.0
+@COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1@     .$(SO_SUFFIX).0.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@       = .1.0.0.$(SO_SUFFIX)
-@COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -1.$(SO_SUFFIX)
+@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_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
  @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  @COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
  @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
  @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
  @COND_TOOLKIT_MSW@     $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_61 = \
+@COND_WXUSE_LIBTIFF_BUILTIN@   --include-dir $(top_srcdir)/src/tiff
+@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_62 = \
+@COND_WXUSE_LIBJPEG_BUILTIN@   --include-dir $(top_srcdir)/src/jpeg
+@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_61 = \
+@COND_WXUSE_LIBPNG_BUILTIN@    --include-dir $(top_srcdir)/src/png
+@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_63 = \
+@COND_WXUSE_ZLIB_BUILTIN@      --include-dir $(top_srcdir)/src/zlib
+@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_61 = \
+@COND_WXUSE_ODBC_BUILTIN@      --include-dir $(top_srcdir)/src/odbc
+@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_61 = \
+@COND_WXUSE_REGEX_BUILTIN@     --include-dir $(top_srcdir)/src/regex
+@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p_61 = \
+@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_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)
@@ -11100,9 +11652,9 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
  
  ### Targets: ###
  
  
  ### Targets: ###
  
-all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___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) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
+all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___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) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___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)
  
  
-install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_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_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
+install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_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_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___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_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
@@ -11137,7 +11689,15 @@ install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__in
         @echo " ------------------------------------------------------"
         @echo " "
  
         @echo " ------------------------------------------------------"
         @echo " "
  
-uninstall: 
+uninstall: $(__uninstall_wxregex___depname) $(__uninstall_wxzlib___depname) $(__uninstall_wxpng___depname) $(__uninstall_wxjpeg___depname) $(__uninstall_wxtiff___depname) $(__uninstall_wxodbc___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_odbcdll___depname) $(__uninstall_odbclib___depname) $(__uninstall_dbgriddll___depname) $(__uninstall_dbgridlib___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
+       (cd $(DESTDIR)$(datadir)/aclocal ; rm -f wxwin.m4)
+       (cd $(DESTDIR)$(datadir)/bakefile/presets ; rm -f wx.bkl wx_unix.bkl wx_win32.bkl)
+       for f in setup.h $(RCDEFS_H); do \
+       rm -f $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f; \
+       done
+       for f in $(ALL_HEADERS); do \
+       rm -f $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/$$f; \
+       done
  
  install-strip: install
         $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
  
  install-strip: install
         $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
@@ -11154,6 +11714,7 @@ install-strip: install
         $(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)_richtext$(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)_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)$(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)
  
@@ -11167,6 +11728,7 @@ clean: $(__clean_wxrc___depname)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxodbc$(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)wxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
         rm -f $(LIBDIRNAME)/$(LIBPREFIX)wxodbc$(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)/$(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)
@@ -11223,82 +11785,120 @@ clean: $(__clean_wxrc___depname)
         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)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
         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)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+       rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+       rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
         rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
         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)
         (cd samples && $(MAKE) clean)
         rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
         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)
         (cd samples && $(MAKE) clean)
-       rm -f lib/libwx_$(TOOLCHAIN_NAME).1.rsrc lib/libwx_$(TOOLCHAIN_NAME).1.r
+       rm -f lib/libwx_$(TOOLCHAIN_NAME).0.rsrc lib/libwx_$(TOOLCHAIN_NAME).0.r
  
  distclean: clean
         rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
  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@$(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) rcu $@ $(WXREGEX_OBJECTS)
+@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_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@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@$(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) rcu $@ $(WXZLIB_OBJECTS)
+@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_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@uninstall_wxzlib: 
+@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@     rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxzlib$(WXDEBUGFLAG)$(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@$(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) rcu $@ $(WXPNG_OBJECTS)
+@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_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@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_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@$(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) rcu $@ $(WXJPEG_OBJECTS)
+@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_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@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_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@$(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) rcu $@ $(WXTIFF_OBJECTS)
+@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_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@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_WXUSE_ODBC_BUILTIN@$(LIBDIRNAME)/$(LIBPREFIX)wxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXODBC_OBJECTS)
  @COND_WXUSE_ODBC_BUILTIN@      rm -f $@
  @COND_WXUSE_ODBC_BUILTIN@$(LIBDIRNAME)/$(LIBPREFIX)wxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(WXODBC_OBJECTS)
  @COND_WXUSE_ODBC_BUILTIN@      rm -f $@
-@COND_WXUSE_ODBC_BUILTIN@      $(AR) rcu $@ $(WXODBC_OBJECTS)
+@COND_WXUSE_ODBC_BUILTIN@      $(AR) $(AROPTIONS) $@ $(WXODBC_OBJECTS)
  @COND_WXUSE_ODBC_BUILTIN@      $(RANLIB) $@
  
  @COND_SHARED_0_WXUSE_ODBC_BUILTIN@install_wxodbc: 
  @COND_SHARED_0_WXUSE_ODBC_BUILTIN@     $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_SHARED_0_WXUSE_ODBC_BUILTIN@     $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_WXUSE_ODBC_BUILTIN@      $(RANLIB) $@
  
  @COND_SHARED_0_WXUSE_ODBC_BUILTIN@install_wxodbc: 
  @COND_SHARED_0_WXUSE_ODBC_BUILTIN@     $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_SHARED_0_WXUSE_ODBC_BUILTIN@     $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
+@COND_SHARED_0_WXUSE_ODBC_BUILTIN@uninstall_wxodbc: 
+@COND_SHARED_0_WXUSE_ODBC_BUILTIN@     rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxodbc$(WXDEBUGFLAG)$(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@$(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) rcu $@ $(WXEXPAT_OBJECTS)
+@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_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_MONOLITHIC_1_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MONODLL_OBJECTS) $(__monodll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname)
-@COND_MONOLITHIC_1_SHARED_1@   $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(WXMACVERSION_CMD)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_ODBC) $(PLUGIN_ADV_EXTRALIBS)
+@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_USE_STC_1@$(LIBDIRNAME)/$(LIBPREFIX)wxscintilla$(WXDEBUGFLAG)$(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_SHARED_0_USE_STC_1@install_wxscintilla: 
+@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@uninstall_wxscintilla: 
+@COND_SHARED_0_USE_STC_1@      rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxscintilla$(WXDEBUGFLAG)$(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) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__wxscintilla___depname) $(__monodll___win32rc) $(__wxscintilla___depname)
+@COND_MONOLITHIC_1_SHARED_1@   $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) -L$(LIBDIRNAME) $(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_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_ODBC) $(PLUGIN_ADV_EXTRALIBS) -lwxscintilla$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
  @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)
  
@@ -11308,23 +11908,31 @@ distclean: clean
  @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@   (cd $(DESTDIR)$(libdir) ; $(__monodll___so_symlinks_inst_cmd))
  
  @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@   (cd $(DESTDIR)$(libdir) ; $(__monodll___so_symlinks_inst_cmd))
  
+@COND_MONOLITHIC_1_SHARED_1@uninstall_monodll: 
+@COND_MONOLITHIC_1_SHARED_1@   rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@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@.pch/wxprec_monodll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_monodll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MONODLL_CXXFLAGS)
+@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@$(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) rcu $@ $(MONOLIB_OBJECTS)
+@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_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@   $(RANLIB) $@
  
  @COND_MONOLITHIC_1_SHARED_0@install_monolib: 
  @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@.pch/wxprec_monolib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_monolib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MONOLIB_CXXFLAGS)
+@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) $(__basedll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname)
-@COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@ $(BASEDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__basedll___macinstnamecmd) $(__basedll___importlib) $(__basedll___soname_flags) $(WXMACVERSION_CMD)  $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
+@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) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__wxscintilla___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_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
  @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)
  
@@ -11334,23 +11942,33 @@ distclean: clean
  @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@   (cd $(DESTDIR)$(libdir) ; $(__basedll___so_symlinks_inst_cmd))
  
  @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@   (cd $(DESTDIR)$(libdir) ; $(__basedll___so_symlinks_inst_cmd))
  
+@COND_MONOLITHIC_0_SHARED_1@uninstall_basedll: 
+@COND_MONOLITHIC_0_SHARED_1@   rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@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@.pch/wxprec_basedll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_basedll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(BASEDLL_CXXFLAGS)
+@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@$(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) rcu $@ $(BASELIB_OBJECTS)
+@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_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@   $(RANLIB) $@
  
  @COND_MONOLITHIC_0_SHARED_0@install_baselib: 
  @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@.pch/wxprec_baselib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_baselib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(BASELIB_CXXFLAGS)
+@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) $(__netdll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@ $(NETDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__netdll___macinstnamecmd) $(__netdll___importlib) $(__netdll___soname_flags) $(WXMACVERSION_CMD)  $(__LIB_ZLIB_p) $(__LIB_ODBC_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@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__wxscintilla___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_ODBC_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@   
  @COND_MONOLITHIC_0_SHARED_1@   $(__netdll___so_symlinks_cmd)
  
  @COND_MONOLITHIC_0_SHARED_1@   
  @COND_MONOLITHIC_0_SHARED_1@   $(__netdll___so_symlinks_cmd)
  
@@ -11360,23 +11978,33 @@ distclean: clean
  @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@   (cd $(DESTDIR)$(libdir) ; $(__netdll___so_symlinks_inst_cmd))
  
  @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@   (cd $(DESTDIR)$(libdir) ; $(__netdll___so_symlinks_inst_cmd))
  
+@COND_MONOLITHIC_0_SHARED_1@uninstall_netdll: 
+@COND_MONOLITHIC_0_SHARED_1@   rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@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@.pch/wxprec_netdll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_netdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETDLL_CXXFLAGS)
+@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@$(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) rcu $@ $(NETLIB_OBJECTS)
+@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_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@   $(RANLIB) $@
  
  @COND_MONOLITHIC_0_SHARED_0@install_netlib: 
  @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@.pch/wxprec_netlib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_netlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETLIB_CXXFLAGS)
+@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) $(__coredll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(COREDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__coredll___macinstnamecmd) $(__coredll___importlib) $(__coredll___soname_flags) $(WXMACVERSION_CMD)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_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@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__wxscintilla___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_ODBC_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@ 
  @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)
  
@@ -11386,23 +12014,33 @@ distclean: clean
  @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@ (cd $(DESTDIR)$(libdir) ; $(__coredll___so_symlinks_inst_cmd))
  
  @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@ (cd $(DESTDIR)$(libdir) ; $(__coredll___so_symlinks_inst_cmd))
  
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@uninstall_coredll: 
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@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@.pch/wxprec_coredll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_coredll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(COREDLL_CXXFLAGS)
+@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@$(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) rcu $@ $(CORELIB_OBJECTS)
+@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_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@ $(RANLIB) $@
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@install_corelib: 
  @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@.pch/wxprec_corelib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_corelib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(CORELIB_CXXFLAGS)
+@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) $(__advdll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(ADVDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__advdll___macinstnamecmd) $(__advdll___importlib) $(__advdll___soname_flags) $(WXMACVERSION_CMD)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_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@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__wxscintilla___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_ODBC_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@ 
  @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)
  
@@ -11412,23 +12050,33 @@ distclean: clean
  @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@ (cd $(DESTDIR)$(libdir) ; $(__advdll___so_symlinks_inst_cmd))
  
  @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@ (cd $(DESTDIR)$(libdir) ; $(__advdll___so_symlinks_inst_cmd))
  
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@uninstall_advdll: 
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@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@.pch/wxprec_advdll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_advdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ADVDLL_CXXFLAGS)
+@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@$(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) rcu $@ $(ADVLIB_OBJECTS)
+@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_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@ $(RANLIB) $@
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@install_advlib: 
  @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@.pch/wxprec_advlib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_advlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ADVLIB_CXXFLAGS)
+@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) $(__mediadll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@     $(SHARED_LD_CXX) $@ $(MEDIADLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__mediadll___macinstnamecmd) $(__mediadll___importlib) $(__mediadll___soname_flags) $(WXMACVERSION_CMD)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_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)
+@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) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__wxscintilla___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_ODBC_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)
  @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)
  
@@ -11438,23 +12086,33 @@ distclean: clean
  @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@     (cd $(DESTDIR)$(libdir) ; $(__mediadll___so_symlinks_inst_cmd))
  
  @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@     (cd $(DESTDIR)$(libdir) ; $(__mediadll___so_symlinks_inst_cmd))
  
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@uninstall_mediadll: 
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@     rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@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@.pch/wxprec_mediadll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_mediadll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MEDIADLL_CXXFLAGS)
+@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@$(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) rcu $@ $(MEDIALIB_OBJECTS)
+@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_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@     $(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_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@.pch/wxprec_medialib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_medialib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MEDIALIB_CXXFLAGS)
+@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_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(ODBCDLL_OBJECTS) $(__odbcdll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        $(SHARED_LD_CXX) $@ $(ODBCDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__odbcdll___macinstnamecmd) $(__odbcdll___importlib) $(__odbcdll___soname_flags) $(WXMACVERSION_CMD)  $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_ODBC)
+@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__wxscintilla___depname) $(__odbcdll___win32rc) $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        $(SHARED_LD_CXX) $@ $(ODBCDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__odbcdll___macinstnamecmd) $(__odbcdll___importlib) $(__odbcdll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_ODBC)
  @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        
  @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        $(__odbcdll___so_symlinks_cmd)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        
  @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        $(__odbcdll___so_symlinks_cmd)
  
@@ -11464,23 +12122,31 @@ distclean: clean
  @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        (cd $(DESTDIR)$(libdir) ; $(__odbcdll___so_symlinks_inst_cmd))
  
  @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        (cd $(DESTDIR)$(libdir) ; $(__odbcdll___so_symlinks_inst_cmd))
  
+@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@uninstall_odbcdll: 
+@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        (cd $(DESTDIR)$(libdir) ; $(__odbcdll___so_symlinks_uninst_cmd))
+
  @COND_USE_PCH_1@.pch/wxprec_odbcdll/wx/wxprec.h.gch: 
  @COND_USE_PCH_1@.pch/wxprec_odbcdll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_odbcdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ODBCDLL_CXXFLAGS)
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_odbcdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ODBCDLL_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(ODBCLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        rm -f $@
  
  @COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(ODBCLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        rm -f $@
-@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        $(AR) rcu $@ $(ODBCLIB_OBJECTS)
+@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        $(AR) $(AROPTIONS) $@ $(ODBCLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        $(RANLIB) $@
  
  @COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@install_odbclib: 
  @COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        $(RANLIB) $@
  
  @COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@install_odbclib: 
  @COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
+@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@uninstall_odbclib: 
+@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+
  @COND_USE_PCH_1@.pch/wxprec_odbclib/wx/wxprec.h.gch: 
  @COND_USE_PCH_1@.pch/wxprec_odbclib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_odbclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ODBCLIB_CXXFLAGS)
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_odbclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ODBCLIB_CXXFLAGS)
  
  
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(DBGRIDDLL_OBJECTS) $(__dbgriddll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      $(SHARED_LD_CXX) $@ $(DBGRIDDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__dbgriddll___macinstnamecmd) $(__dbgriddll___importlib) $(__dbgriddll___soname_flags) $(WXMACVERSION_CMD)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(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_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__wxscintilla___depname) $(__dbgriddll___win32rc) $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      $(SHARED_LD_CXX) $@ $(DBGRIDDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__dbgriddll___macinstnamecmd) $(__dbgriddll___importlib) $(__dbgriddll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc-$(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_GUI_1_USE_ODBC_1@      
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      $(__dbgriddll___so_symlinks_cmd)
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      $(__dbgriddll___so_symlinks_cmd)
  
@@ -11490,23 +12156,33 @@ distclean: clean
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      (cd $(DESTDIR)$(libdir) ; $(__dbgriddll___so_symlinks_inst_cmd))
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      (cd $(DESTDIR)$(libdir) ; $(__dbgriddll___so_symlinks_inst_cmd))
  
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@uninstall_dbgriddll: 
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      (cd $(DESTDIR)$(libdir) ; $(__dbgriddll___so_symlinks_uninst_cmd))
+
  @COND_USE_PCH_1@.pch/wxprec_dbgriddll/wx/wxprec.h.gch: 
  @COND_USE_PCH_1@.pch/wxprec_dbgriddll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_dbgriddll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(DBGRIDDLL_CXXFLAGS)
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_dbgriddll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(DBGRIDDLL_CXXFLAGS)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(DBGRIDLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      rm -f $@
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(DBGRIDLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      rm -f $@
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      $(AR) rcu $@ $(DBGRIDLIB_OBJECTS)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      $(AR) $(AROPTIONS) $@ $(DBGRIDLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      $(RANLIB) $@
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@install_dbgridlib: 
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      $(RANLIB) $@
  
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@install_dbgridlib: 
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      $(INSTALL_DIR) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT) $(DESTDIR)$(libdir)
  
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@uninstall_dbgridlib: 
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+
  @COND_USE_PCH_1@.pch/wxprec_dbgridlib/wx/wxprec.h.gch: 
  @COND_USE_PCH_1@.pch/wxprec_dbgridlib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_dbgridlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(DBGRIDLIB_CXXFLAGS)
+@COND_USE_PCH_1@       $(BK_MAKE_PCH) .pch/wxprec_dbgridlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(DBGRIDLIB_CXXFLAGS)
+
+@COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1@wxdbgrid: $(____wxdbgrid_namedll_DEP) $(____wxdbgrid_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) $(__htmldll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      $(SHARED_LD_CXX) $@ $(HTMLDLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__htmldll___macinstnamecmd) $(__htmldll___importlib) $(__htmldll___soname_flags) $(WXMACVERSION_CMD)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_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@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__wxscintilla___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_ODBC_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@      
  @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)
  
@@ -11516,23 +12192,33 @@ distclean: clean
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      (cd $(DESTDIR)$(libdir) ; $(__htmldll___so_symlinks_inst_cmd))
  
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
  @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      (cd $(DESTDIR)$(libdir) ; $(__htmldll___so_symlinks_inst_cmd))
  
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@uninstall_htmldll: 
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1@      rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@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@.pch/wxprec_htmldll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_htmldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(HTMLDLL_CXXFLAGS)
+@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@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT): $(HTMLLIB_OBJECTS)
  @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@      rm -f $@
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@      $(AR) rcu $@ $(HTMLLIB_OBJECTS)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1@      $(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_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@      $(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_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@.pch/wxprec_htmllib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_htmllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(HTMLLIB_CXXFLAGS)
+@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_SHARED_1_USE_GUI_1_USE_QA_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(QADLL_OBJECTS) $(__qadll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__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)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_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@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__wxscintilla___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_ODBC_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@        
  @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)
  
@@ -11542,23 +12228,33 @@ distclean: clean
  @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@        (cd $(DESTDIR)$(libdir) ; $(__qadll___so_symlinks_inst_cmd))
  
  @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@        (cd $(DESTDIR)$(libdir) ; $(__qadll___so_symlinks_inst_cmd))
  
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@uninstall_qadll: 
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1@        rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@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@.pch/wxprec_qadll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_qadll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(QADLL_CXXFLAGS)
+@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@$(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) rcu $@ $(QALIB_OBJECTS)
+@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_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@        $(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_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@.pch/wxprec_qalib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_qalib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(QALIB_CXXFLAGS)
+@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) $(__xmldll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@ $(XMLDLL_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__xmldll___macinstnamecmd) $(__xmldll___importlib) $(__xmldll___soname_flags) $(WXMACVERSION_CMD)  $(__LIB_ZLIB_p) $(__LIB_ODBC_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@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__wxscintilla___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_ODBC_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@   
  @COND_MONOLITHIC_0_SHARED_1@   $(__xmldll___so_symlinks_cmd)
  
  @COND_MONOLITHIC_0_SHARED_1@   
  @COND_MONOLITHIC_0_SHARED_1@   $(__xmldll___so_symlinks_cmd)
  
@@ -11568,23 +12264,33 @@ distclean: clean
  @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@   (cd $(DESTDIR)$(libdir) ; $(__xmldll___so_symlinks_inst_cmd))
  
  @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@   (cd $(DESTDIR)$(libdir) ; $(__xmldll___so_symlinks_inst_cmd))
  
+@COND_MONOLITHIC_0_SHARED_1@uninstall_xmldll: 
+@COND_MONOLITHIC_0_SHARED_1@   rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@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@.pch/wxprec_xmldll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_xmldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XMLDLL_CXXFLAGS)
+@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@$(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) rcu $@ $(XMLLIB_OBJECTS)
+@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_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@   $(RANLIB) $@
  
  @COND_MONOLITHIC_0_SHARED_0@install_xmllib: 
  @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@.pch/wxprec_xmllib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_xmllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XMLLIB_CXXFLAGS)
+@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) $(__xrcdll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__htmldll___depname) $(__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) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(WXMACVERSION_CMD)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX) -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@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__wxscintilla___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_ODBC_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@ 
  @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)
  
@@ -11594,23 +12300,33 @@ distclean: clean
  @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@ (cd $(DESTDIR)$(libdir) ; $(__xrcdll___so_symlinks_inst_cmd))
  
  @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@ (cd $(DESTDIR)$(libdir) ; $(__xrcdll___so_symlinks_inst_cmd))
  
+@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@uninstall_xrcdll: 
+@COND_MONOLITHIC_0_SHARED_1_USE_XRC_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@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@.pch/wxprec_xrcdll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_xrcdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XRCDLL_CXXFLAGS)
+@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@$(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) rcu $@ $(XRCLIB_OBJECTS)
+@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_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@ $(RANLIB) $@
  
  @COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@install_xrclib: 
  @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@.pch/wxprec_xrclib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_xrclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XRCLIB_CXXFLAGS)
+@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) $(__auidll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__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)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_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@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__wxscintilla___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_ODBC_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@ 
  @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)
  
@@ -11620,23 +12336,33 @@ distclean: clean
  @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@ (cd $(DESTDIR)$(libdir) ; $(__auidll___so_symlinks_inst_cmd))
  
  @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@ (cd $(DESTDIR)$(libdir) ; $(__auidll___so_symlinks_inst_cmd))
  
+@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@uninstall_auidll: 
+@COND_MONOLITHIC_0_SHARED_1_USE_AUI_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@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@.pch/wxprec_auidll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_auidll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(AUIDLL_CXXFLAGS)
+@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@$(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) rcu $@ $(AUILIB_OBJECTS)
+@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_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@ $(RANLIB) $@
  
  @COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@install_auilib: 
  @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@.pch/wxprec_auilib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_auilib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(AUILIB_CXXFLAGS)
+@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_SHARED_1_USE_RICHTEXT_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(RICHTEXTDLL_OBJECTS) $(__richtextdll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__advdll___depname) $(__htmldll___depname) $(__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) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS)   -L$(LIBDIRNAME) $(__richtextdll___macinstnamecmd) $(__richtextdll___importlib) $(__richtextdll___soname_flags) $(WXMACVERSION_CMD)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_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)_html-$(WX_RELEASE)$(HOST_SUFFIX) -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@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__wxscintilla___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_ODBC_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@    
  @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)
  
@@ -11646,23 +12372,69 @@ distclean: clean
  @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@    (cd $(DESTDIR)$(libdir) ; $(__richtextdll___so_symlinks_inst_cmd))
  
  @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@    (cd $(DESTDIR)$(libdir) ; $(__richtextdll___so_symlinks_inst_cmd))
  
+@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@uninstall_richtextdll: 
+@COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1@    rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@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@.pch/wxprec_richtextdll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_richtextdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(RICHTEXTDLL_CXXFLAGS)
+@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@$(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) rcu $@ $(RICHTEXTLIB_OBJECTS)
+@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_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@    $(RANLIB) $@
  
  @COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1@install_richtextlib: 
  @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@.pch/wxprec_richtextlib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_richtextlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(RICHTEXTLIB_CXXFLAGS)
+@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) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__wxscintilla___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_ODBC_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@ 
+@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_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@ (cd $(DESTDIR)$(libdir) ; $(__stcdll___so_symlinks_inst_cmd))
+
+@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@uninstall_stcdll: 
+@COND_MONOLITHIC_0_SHARED_1_USE_STC_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@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_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_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_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(GLDLL_OBJECTS) $(__gldll___win32rc) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname) $(__coredll___depname)
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(SHARED_LD_CXX) $@ $(GLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__gldll___macinstnamecmd) $(__gldll___importlib) $(__gldll___soname_flags) $(WXMACVERSION_CMD)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) $(EXTRALIBS_OPENGL)
+@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) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__wxscintilla___depname) $(__gldll___win32rc) $(__basedll___depname) $(__coredll___depname)
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(SHARED_LD_CXX) $@ $(GLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__gldll___macinstnamecmd) $(__gldll___importlib) $(__gldll___soname_flags) $(WXMACVERSION_CMD)  $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_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@ 
  @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)
  
@@ -11672,28 +12444,41 @@ distclean: clean
  @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@ (cd $(DESTDIR)$(libdir) ; $(__gldll___so_symlinks_inst_cmd))
  
  @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@ (cd $(DESTDIR)$(libdir) ; $(__gldll___so_symlinks_inst_cmd))
  
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@uninstall_gldll: 
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@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@.pch/wxprec_gldll/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_gldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GLDLL_CXXFLAGS)
+@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@$(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) rcu $@ $(GLLIB_OBJECTS)
+@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_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@ $(RANLIB) $@
  
  @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@install_gllib: 
  @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@.pch/wxprec_gllib/wx/wxprec.h.gch: 
-@COND_USE_PCH_1@       $(top_builddir)./bk-make-pch .pch/wxprec_gllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GLLIB_CXXFLAGS)
+@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_WITH_PLUGIN_SDL_1@$(DLLPREFIX_MODULE)sound_sdl$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE): $(SOUND_SDL_OBJECTS)
  
  @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)  $(EXTRALIBS_SDL)
+@COND_WITH_PLUGIN_SDL_1@       $(SHARED_LD_MODULE_CXX) $@ $(SOUND_SDL_OBJECTS) $(LDFLAGS)  $(LIBS) $(EXTRALIBS_SDL)
  
  @COND_WITH_PLUGIN_SDL_1@install_sound_sdl: 
  @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_sound_sdl: 
  @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@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)
+
  samples: 
         (cd samples && $(MAKE) all)
  
  samples: 
         (cd samples && $(MAKE) all)
  
@@ -11710,7 +12495,7 @@ install-wxconfig:
         $(INSTALL_DIR) $(DESTDIR)$(bindir)
         $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
         $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
         $(INSTALL_DIR) $(DESTDIR)$(bindir)
         $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
         $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
-       (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+       (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
  
  locale_install: 
         $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
  
  locale_install: 
         $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
@@ -11722,6 +12507,13 @@ locale_install:
         fi ; \
         done
  
         fi ; \
         done
  
+locale_uninstall: 
+       for l in $(LOCALE_LINGUAS) ; do \
+       if test -f $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; then \
+       rm -f $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
+       fi ; \
+       done
+
  locale_msw_install: 
         $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
         for l in $(LOCALE_MSW_LINGUAS) ; do \
  locale_msw_install: 
         $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
         for l in $(LOCALE_MSW_LINGUAS) ; do \
@@ -11732,13 +12524,20 @@ locale_msw_install:
         fi ; \
         done
  
         fi ; \
         done
  
-@COND_TOOLKIT_COCOA@lib/libwx_$(TOOLCHAIN_NAME).1.r: 
-@COND_TOOLKIT_COCOA@   $(REZ) -d __UNIX__ -useDF $(top_srcdir)/src/cocoa/dummy.r -o lib/libwx_$(TOOLCHAIN_NAME).1.rsrc
-@COND_TOOLKIT_COCOA@   $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).1.rsrc -useDF >lib/libwx_$(TOOLCHAIN_NAME).1.r
+locale_msw_uninstall: 
+       for l in $(LOCALE_MSW_LINGUAS) ; do \
+       if test -f $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw.mo ; then \
+       rm -f $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw.mo ; \
+       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@cocoa-res-install: $(__cocoa_res___depname)
  
  @COND_TOOLKIT_COCOA@cocoa-res-install: $(__cocoa_res___depname)
-@COND_TOOLKIT_COCOA@   $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).1.r $(libdir)
-@COND_TOOLKIT_COCOA@   $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).1.rsrc $(libdir)
+@COND_TOOLKIT_COCOA@   $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).0.r $(libdir)
+@COND_TOOLKIT_COCOA@   $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).0.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
@@ -12121,38 +12920,278 @@ wxodbc_hdbc.o: $(srcdir)/src/iodbc/hdbc.c
  wxodbc_henv.o: $(srcdir)/src/iodbc/henv.c
         $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/henv.c
  
  wxodbc_henv.o: $(srcdir)/src/iodbc/henv.c
         $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/henv.c
  
-wxodbc_herr.o: $(srcdir)/src/iodbc/herr.c
-       $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/herr.c
+wxodbc_herr.o: $(srcdir)/src/iodbc/herr.c
+       $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/herr.c
+
+wxodbc_hstmt.o: $(srcdir)/src/iodbc/hstmt.c
+       $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/hstmt.c
+
+wxodbc_info.o: $(srcdir)/src/iodbc/info.c
+       $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/info.c
+
+wxodbc_itrace.o: $(srcdir)/src/iodbc/itrace.c
+       $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/itrace.c
+
+wxodbc_misc.o: $(srcdir)/src/iodbc/misc.c
+       $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/misc.c
+
+wxodbc_prepare.o: $(srcdir)/src/iodbc/prepare.c
+       $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/prepare.c
+
+wxodbc_result.o: $(srcdir)/src/iodbc/result.c
+       $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/result.c
+
+wxexpat_xmlparse.o: $(srcdir)/src/expat/lib/xmlparse.c
+       $(CCC) -c -o $@ $(WXEXPAT_CFLAGS) $(srcdir)/src/expat/lib/xmlparse.c
+
+wxexpat_xmlrole.o: $(srcdir)/src/expat/lib/xmlrole.c
+       $(CCC) -c -o $@ $(WXEXPAT_CFLAGS) $(srcdir)/src/expat/lib/xmlrole.c
+
+wxexpat_xmltok.o: $(srcdir)/src/expat/lib/xmltok.c
+       $(CCC) -c -o $@ $(WXEXPAT_CFLAGS) $(srcdir)/src/expat/lib/xmltok.c
+
+wxscintilla_AutoComplete.o: $(srcdir)/src/stc/scintilla/src/AutoComplete.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/AutoComplete.cxx
+
+wxscintilla_CallTip.o: $(srcdir)/src/stc/scintilla/src/CallTip.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/CallTip.cxx
+
+wxscintilla_CellBuffer.o: $(srcdir)/src/stc/scintilla/src/CellBuffer.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/CellBuffer.cxx
+
+wxscintilla_CharClassify.o: $(srcdir)/src/stc/scintilla/src/CharClassify.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/CharClassify.cxx
+
+wxscintilla_ContractionState.o: $(srcdir)/src/stc/scintilla/src/ContractionState.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/ContractionState.cxx
+
+wxscintilla_Document.o: $(srcdir)/src/stc/scintilla/src/Document.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/Document.cxx
+
+wxscintilla_DocumentAccessor.o: $(srcdir)/src/stc/scintilla/src/DocumentAccessor.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/DocumentAccessor.cxx
+
+wxscintilla_Editor.o: $(srcdir)/src/stc/scintilla/src/Editor.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/Editor.cxx
+
+wxscintilla_ExternalLexer.o: $(srcdir)/src/stc/scintilla/src/ExternalLexer.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/ExternalLexer.cxx
+
+wxscintilla_Indicator.o: $(srcdir)/src/stc/scintilla/src/Indicator.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/Indicator.cxx
+
+wxscintilla_KeyMap.o: $(srcdir)/src/stc/scintilla/src/KeyMap.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/KeyMap.cxx
+
+wxscintilla_KeyWords.o: $(srcdir)/src/stc/scintilla/src/KeyWords.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(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_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_LexAda.o: $(srcdir)/src/stc/scintilla/src/LexAda.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexAda.cxx
+
+wxscintilla_LexAsm.o: $(srcdir)/src/stc/scintilla/src/LexAsm.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexAsm.cxx
+
+wxscintilla_LexAsn1.o: $(srcdir)/src/stc/scintilla/src/LexAsn1.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexAsn1.cxx
+
+wxscintilla_LexBaan.o: $(srcdir)/src/stc/scintilla/src/LexBaan.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexBaan.cxx
+
+wxscintilla_LexBash.o: $(srcdir)/src/stc/scintilla/src/LexBash.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexBash.cxx
+
+wxscintilla_LexBasic.o: $(srcdir)/src/stc/scintilla/src/LexBasic.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexBasic.cxx
+
+wxscintilla_LexBullant.o: $(srcdir)/src/stc/scintilla/src/LexBullant.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(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_LexCPP.o: $(srcdir)/src/stc/scintilla/src/LexCPP.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexCPP.cxx
+
+wxscintilla_LexCSS.o: $(srcdir)/src/stc/scintilla/src/LexCSS.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(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_LexCsound.o: $(srcdir)/src/stc/scintilla/src/LexCsound.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexCsound.cxx
+
+wxscintilla_LexConf.o: $(srcdir)/src/stc/scintilla/src/LexConf.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(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_LexEScript.o: $(srcdir)/src/stc/scintilla/src/LexEScript.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexEScript.cxx
+
+wxscintilla_LexEiffel.o: $(srcdir)/src/stc/scintilla/src/LexEiffel.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexEiffel.cxx
+
+wxscintilla_LexErlang.o: $(srcdir)/src/stc/scintilla/src/LexErlang.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexErlang.cxx
+
+wxscintilla_LexFlagship.o: $(srcdir)/src/stc/scintilla/src/LexFlagship.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexFlagship.cxx
+
+wxscintilla_LexForth.o: $(srcdir)/src/stc/scintilla/src/LexForth.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexForth.cxx
+
+wxscintilla_LexFortran.o: $(srcdir)/src/stc/scintilla/src/LexFortran.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexFortran.cxx
+
+wxscintilla_LexGui4Cli.o: $(srcdir)/src/stc/scintilla/src/LexGui4Cli.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexGui4Cli.cxx
+
+wxscintilla_LexHTML.o: $(srcdir)/src/stc/scintilla/src/LexHTML.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexHTML.cxx
+
+wxscintilla_LexHaskell.o: $(srcdir)/src/stc/scintilla/src/LexHaskell.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexHaskell.cxx
+
+wxscintilla_LexInno.o: $(srcdir)/src/stc/scintilla/src/LexInno.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexInno.cxx
+
+wxscintilla_LexKix.o: $(srcdir)/src/stc/scintilla/src/LexKix.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexKix.cxx
+
+wxscintilla_LexLisp.o: $(srcdir)/src/stc/scintilla/src/LexLisp.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexLisp.cxx
+
+wxscintilla_LexLout.o: $(srcdir)/src/stc/scintilla/src/LexLout.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexLout.cxx
+
+wxscintilla_LexLua.o: $(srcdir)/src/stc/scintilla/src/LexLua.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexLua.cxx
+
+wxscintilla_LexMMIXAL.o: $(srcdir)/src/stc/scintilla/src/LexMMIXAL.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexMMIXAL.cxx
+
+wxscintilla_LexMPT.o: $(srcdir)/src/stc/scintilla/src/LexMPT.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(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_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_LexNsis.o: $(srcdir)/src/stc/scintilla/src/LexNsis.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexNsis.cxx
+
+wxscintilla_LexOpal.o: $(srcdir)/src/stc/scintilla/src/LexOpal.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexOpal.cxx
+
+wxscintilla_LexOthers.o: $(srcdir)/src/stc/scintilla/src/LexOthers.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexOthers.cxx
+
+wxscintilla_LexPB.o: $(srcdir)/src/stc/scintilla/src/LexPB.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexPB.cxx
+
+wxscintilla_LexPOV.o: $(srcdir)/src/stc/scintilla/src/LexPOV.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexPOV.cxx
+
+wxscintilla_LexPS.o: $(srcdir)/src/stc/scintilla/src/LexPS.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexPS.cxx
+
+wxscintilla_LexPascal.o: $(srcdir)/src/stc/scintilla/src/LexPascal.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(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_LexPython.o: $(srcdir)/src/stc/scintilla/src/LexPython.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexPython.cxx
+
+wxscintilla_LexRebol.o: $(srcdir)/src/stc/scintilla/src/LexRebol.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(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_LexSQL.o: $(srcdir)/src/stc/scintilla/src/LexSQL.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexSQL.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_LexSpecman.o: $(srcdir)/src/stc/scintilla/src/LexSpecman.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(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_LexTCL.o: $(srcdir)/src/stc/scintilla/src/LexTCL.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexTCL.cxx
+
+wxscintilla_LexTeX.o: $(srcdir)/src/stc/scintilla/src/LexTeX.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexTeX.cxx
+
+wxscintilla_LexVB.o: $(srcdir)/src/stc/scintilla/src/LexVB.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexVB.cxx
+
+wxscintilla_LexVHDL.o: $(srcdir)/src/stc/scintilla/src/LexVHDL.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexVHDL.cxx
+
+wxscintilla_LexVerilog.o: $(srcdir)/src/stc/scintilla/src/LexVerilog.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexVerilog.cxx
  
  
-wxodbc_hstmt.o: $(srcdir)/src/iodbc/hstmt.c
-       $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/hstmt.c
+wxscintilla_LexYAML.o: $(srcdir)/src/stc/scintilla/src/LexYAML.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LexYAML.cxx
  
  
-wxodbc_info.o: $(srcdir)/src/iodbc/info.c
-       $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/info.c
+wxscintilla_LineMarker.o: $(srcdir)/src/stc/scintilla/src/LineMarker.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/LineMarker.cxx
  
  
-wxodbc_itrace.o: $(srcdir)/src/iodbc/itrace.c
-       $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/itrace.c
+wxscintilla_PropSet.o: $(srcdir)/src/stc/scintilla/src/PropSet.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/PropSet.cxx
  
  
-wxodbc_misc.o: $(srcdir)/src/iodbc/misc.c
-       $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/misc.c
+wxscintilla_RESearch.o: $(srcdir)/src/stc/scintilla/src/RESearch.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/RESearch.cxx
  
  
-wxodbc_prepare.o: $(srcdir)/src/iodbc/prepare.c
-       $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/prepare.c
+wxscintilla_ScintillaBase.o: $(srcdir)/src/stc/scintilla/src/ScintillaBase.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/ScintillaBase.cxx
  
  
-wxodbc_result.o: $(srcdir)/src/iodbc/result.c
-       $(CCC) -c -o $@ $(WXODBC_CFLAGS) $(srcdir)/src/iodbc/result.c
+wxscintilla_Style.o: $(srcdir)/src/stc/scintilla/src/Style.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/Style.cxx
  
  
-wxexpat_xmlparse.o: $(srcdir)/src/expat/lib/xmlparse.c
-       $(CCC) -c -o $@ $(WXEXPAT_CFLAGS) $(srcdir)/src/expat/lib/xmlparse.c
+wxscintilla_StyleContext.o: $(srcdir)/src/stc/scintilla/src/StyleContext.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/StyleContext.cxx
  
  
-wxexpat_xmlrole.o: $(srcdir)/src/expat/lib/xmlrole.c
-       $(CCC) -c -o $@ $(WXEXPAT_CFLAGS) $(srcdir)/src/expat/lib/xmlrole.c
+wxscintilla_UniConversion.o: $(srcdir)/src/stc/scintilla/src/UniConversion.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/UniConversion.cxx
  
  
-wxexpat_xmltok.o: $(srcdir)/src/expat/lib/xmltok.c
-       $(CCC) -c -o $@ $(WXEXPAT_CFLAGS) $(srcdir)/src/expat/lib/xmltok.c
+wxscintilla_ViewStyle.o: $(srcdir)/src/stc/scintilla/src/ViewStyle.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(srcdir)/src/stc/scintilla/src/ViewStyle.cxx
  
  
-monodll_version_rc.o: $(srcdir)/src/msw/version.rc $(MONODLL_ODEP)
-       $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58)  $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+wxscintilla_WindowAccessor.o: $(srcdir)/src/stc/scintilla/src/WindowAccessor.cxx
+       $(CXXC) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(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
  
  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
@@ -12166,6 +13205,9 @@ monodll_arcfind.o: $(srcdir)/src/common/arcfind.cpp $(MONODLL_ODEP)
  monodll_archive.o: $(srcdir)/src/common/archive.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/archive.cpp
  
  monodll_archive.o: $(srcdir)/src/common/archive.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/archive.cpp
  
+monodll_arrstr.o: $(srcdir)/src/common/arrstr.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/arrstr.cpp
+
  monodll_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/clntdata.cpp
  
  monodll_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/clntdata.cpp
  
@@ -12238,9 +13280,6 @@ monodll_fs_arc.o: $(srcdir)/src/common/fs_arc.cpp $(MONODLL_ODEP)
  monodll_fs_filter.o: $(srcdir)/src/common/fs_filter.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fs_filter.cpp
  
  monodll_fs_filter.o: $(srcdir)/src/common/fs_filter.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fs_filter.cpp
  
-monodll_fs_zip.o: $(srcdir)/src/common/fs_zip.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fs_zip.cpp
-
  monodll_hash.o: $(srcdir)/src/common/hash.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/hash.cpp
  
  monodll_hash.o: $(srcdir)/src/common/hash.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/hash.cpp
  
@@ -12310,6 +13349,12 @@ monodll_stream.o: $(srcdir)/src/common/stream.cpp $(MONODLL_ODEP)
  monodll_string.o: $(srcdir)/src/common/string.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/string.cpp
  
  monodll_string.o: $(srcdir)/src/common/string.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/string.cpp
  
+monodll_stringimpl.o: $(srcdir)/src/common/stringimpl.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/stringimpl.cpp
+
+monodll_strvararg.o: $(srcdir)/src/common/strvararg.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/strvararg.cpp
+
  monodll_sysopt.o: $(srcdir)/src/common/sysopt.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/sysopt.cpp
  
  monodll_sysopt.o: $(srcdir)/src/common/sysopt.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/sysopt.cpp
  
@@ -12328,6 +13373,9 @@ monodll_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(MONODLL_ODEP)
  monodll_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(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
  
+monodll_unichar.o: $(srcdir)/src/common/unichar.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/unichar.cpp
+
  monodll_uri.o: $(srcdir)/src/common/uri.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/uri.cpp
  
  monodll_uri.o: $(srcdir)/src/common/uri.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/uri.cpp
  
@@ -12337,8 +13385,11 @@ monodll_variant.o: $(srcdir)/src/common/variant.cpp $(MONODLL_ODEP)
  monodll_wfstream.o: $(srcdir)/src/common/wfstream.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/wfstream.cpp
  
  monodll_wfstream.o: $(srcdir)/src/common/wfstream.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/wfstream.cpp
  
-monodll_wxchar.o: $(srcdir)/src/common/wxchar.cpp $(MONODLL_ODEP)
-       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/wxchar.cpp
+monodll_wxcrt.o: $(srcdir)/src/common/wxcrt.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/wxcrt.cpp
+
+monodll_wxprintf.o: $(srcdir)/src/common/wxprintf.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/wxprintf.cpp
  
  monodll_xti.o: $(srcdir)/src/common/xti.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/xti.cpp
  
  monodll_xti.o: $(srcdir)/src/common/xti.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/xti.cpp
@@ -12472,6 +13523,9 @@ monodll_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONODLL_ODEP)
  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_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/collpane.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
  
@@ -12529,6 +13583,9 @@ monodll_textctrlce.o: $(srcdir)/src/msw/wince/textctrlce.cpp $(MONODLL_ODEP)
  monodll_aga.o: $(srcdir)/src/mac/carbon/aga.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/aga.cpp
  
  monodll_aga.o: $(srcdir)/src/mac/carbon/aga.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/aga.cpp
  
+monodll_artmac.o: $(srcdir)/src/mac/carbon/artmac.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/artmac.cpp
+
  monodll_dccg.o: $(srcdir)/src/mac/carbon/dccg.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/dccg.cpp
  
  monodll_dccg.o: $(srcdir)/src/mac/carbon/dccg.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/dccg.cpp
  
@@ -12541,6 +13598,9 @@ monodll_notebmac.o: $(srcdir)/src/mac/carbon/notebmac.cpp $(MONODLL_ODEP)
  monodll_printmac.o: $(srcdir)/src/mac/carbon/printmac.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/printmac.cpp
  
  monodll_printmac.o: $(srcdir)/src/mac/carbon/printmac.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/printmac.cpp
  
+monodll_srchctrl.o: $(srcdir)/src/mac/carbon/srchctrl.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/srchctrl.cpp
+
  monodll_statbrma.o: $(srcdir)/src/mac/carbon/statbrma.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/statbrma.cpp
  
  monodll_statbrma.o: $(srcdir)/src/mac/carbon/statbrma.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/statbrma.cpp
  
@@ -12775,6 +13835,9 @@ monodll_xh_choicbk.o: $(srcdir)/src/xrc/xh_choicbk.cpp $(MONODLL_ODEP)
  monodll_xh_clrpicker.o: $(srcdir)/src/xrc/xh_clrpicker.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_clrpicker.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_xh_collpane.o: $(srcdir)/src/xrc/xh_collpane.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_collpane.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_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp
  
@@ -12946,6 +14009,15 @@ monodll_richtextstyledlg.o: $(srcdir)/src/richtext/richtextstyledlg.cpp $(MONODL
  monodll_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp
  
  monodll_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp
  
+monodll_stc.o: $(srcdir)/src/stc/stc.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/stc/stc.cpp
+
+monodll_PlatWX.o: $(srcdir)/src/stc/PlatWX.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/stc/PlatWX.cpp
+
+monodll_ScintillaWX.o: $(srcdir)/src/stc/ScintillaWX.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/stc/ScintillaWX.cpp
+
  monodll_xml.o: $(srcdir)/src/xml/xml.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xml/xml.cpp
  
  monodll_xml.o: $(srcdir)/src/xml/xml.cpp $(MONODLL_ODEP)
         $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xml/xml.cpp
  
@@ -13054,6 +14126,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @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
  
  @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
  
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monodll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
+
  @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@monodll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONODLL_ODEP)
  @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
  
  @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@monodll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONODLL_ODEP)
  @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
  
@@ -13069,9 +14144,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_PLATFORM_MACOSX_1_TOOLKIT_@monodll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONODLL_ODEP)
  @COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
  
  @COND_PLATFORM_MACOSX_1_TOOLKIT_@monodll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONODLL_ODEP)
  @COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONODLL_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
-
  @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
  
  @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
  
@@ -13288,9 +14360,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @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
  
  @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
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_main.o: $(srcdir)/src/gtk/main.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/main.cpp
-
  @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
  
  @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
  
@@ -13564,6 +14633,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @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
  
  @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
  
+@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
+
  @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
  
  @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
  
@@ -14347,6 +15419,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_gdiobj.o: $(srcdir)/src/mac/carbon/gdiobj.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/gdiobj.cpp
  
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_gdiobj.o: $(srcdir)/src/mac/carbon/gdiobj.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/gdiobj.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_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_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_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
  
@@ -14464,8 +15542,17 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1@monodll_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1@monodll_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp
  
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/gsockx11.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@monodll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.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_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
@@ -14473,6 +15560,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @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_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_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_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_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_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
  
@@ -14482,6 +15575,15 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @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_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_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_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_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_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_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
  
@@ -15652,6 +16754,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @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_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_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_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_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
  
@@ -15682,6 +16787,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @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_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_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_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/choiccmn.cpp
  
@@ -15727,6 +16835,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @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_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_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_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp
  
@@ -15775,6 +16886,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @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_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_framecmn.o: $(srcdir)/src/common/framecmn.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/framecmn.cpp
  
@@ -15832,6 +16946,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @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_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_imagtiff.o: $(srcdir)/src/common/imagtiff.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/imagtiff.cpp
  
@@ -15889,9 +17006,15 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @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_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_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_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_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_stockitem.o: $(srcdir)/src/common/stockitem.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/stockitem.cpp
  
@@ -15940,6 +17063,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  @COND_USE_GUI_1@monodll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
+@COND_USE_GUI_1@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.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_combog.o: $(srcdir)/src/generic/combog.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/combog.cpp
  
@@ -15991,6 +17117,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@monodll_splitter.o: $(srcdir)/src/generic/splitter.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp
  
  @COND_USE_GUI_1@monodll_splitter.o: $(srcdir)/src/generic/splitter.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp
  
+@COND_USE_GUI_1@monodll_srchctlg.o: $(srcdir)/src/generic/srchctlg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/srchctlg.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
  
@@ -16018,18 +17147,21 @@ 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_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_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_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.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_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/calctrl.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_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/calctrl.cpp
  
-@COND_USE_GUI_1@monodll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.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
  
@@ -16048,8 +17180,8 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@monodll_helpext.o: $(srcdir)/src/generic/helpext.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/helpext.cpp
  
  @COND_USE_GUI_1@monodll_helpext.o: $(srcdir)/src/generic/helpext.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/helpext.cpp
  
-@COND_USE_GUI_1@monodll_hyperlink.o: $(srcdir)/src/generic/hyperlink.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/hyperlink.cpp
+@COND_USE_GUI_1@monodll_hyperlinkg.o: $(srcdir)/src/generic/hyperlinkg.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/hyperlinkg.cpp
  
  @COND_USE_GUI_1@monodll_laywin.o: $(srcdir)/src/generic/laywin.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/laywin.cpp
  
  @COND_USE_GUI_1@monodll_laywin.o: $(srcdir)/src/generic/laywin.cpp $(MONODLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/laywin.cpp
@@ -16072,33 +17204,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @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
  
-@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_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_MAC_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MAC_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_MOTIF_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
-@COND_TOOLKIT_PM_USE_GUI_1@monodll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1@    $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
  @COND_TOOLKIT_MSW_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
  
@@ -16123,6 +17228,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_X11_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
  
  @COND_TOOLKIT_X11_USE_GUI_1@monodll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_X11_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_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_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
  
@@ -16168,6 +17276,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_X11_USE_GUI_1@monodll_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@monodll_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_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_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
  
@@ -16189,15 +17300,18 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_X11_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
  
  @COND_TOOLKIT_X11_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(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_animate.o: $(srcdir)/src/gtk/animate.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/animate.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_animate.o: $(srcdir)/src/gtk/animate.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/animate.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp
-
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dataview.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/dataview.cpp
  
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_hyperlink.o: $(srcdir)/src/gtk/hyperlink.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/hyperlink.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@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk/eggtrayicon.c
  
  @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@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk/eggtrayicon.c
  
@@ -16222,6 +17336,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@monodll_mediactrl_wmp10.o: $(srcdir)/src/msw/mediactrl_wmp10.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_wmp10.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@monodll_mediactrl_wmp10.o: $(srcdir)/src/msw/mediactrl_wmp10.cpp $(MONODLL_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_wmp10.cpp
  
+@COND_TOOLKIT_MSW_USE_GUI_1@monodll_mediactrl_qt.o: $(srcdir)/src/msw/mediactrl_qt.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_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_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
  
@@ -16249,6 +17369,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
  @COND_PLATFORM_MACOSX_1_USE_GUI_1@monodll_chm.o: $(srcdir)/src/html/chm.cpp $(MONODLL_ODEP)
  @COND_PLATFORM_MACOSX_1_USE_GUI_1@     $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/chm.cpp
  
  @COND_PLATFORM_MACOSX_1_USE_GUI_1@monodll_chm.o: $(srcdir)/src/html/chm.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)
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_61) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --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
+
  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
  
@@ -16261,6 +17384,9 @@ monolib_arcfind.o: $(srcdir)/src/common/arcfind.cpp $(MONOLIB_ODEP)
  monolib_archive.o: $(srcdir)/src/common/archive.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/archive.cpp
  
  monolib_archive.o: $(srcdir)/src/common/archive.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/archive.cpp
  
+monolib_arrstr.o: $(srcdir)/src/common/arrstr.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/arrstr.cpp
+
  monolib_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/clntdata.cpp
  
  monolib_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/clntdata.cpp
  
@@ -16333,9 +17459,6 @@ monolib_fs_arc.o: $(srcdir)/src/common/fs_arc.cpp $(MONOLIB_ODEP)
  monolib_fs_filter.o: $(srcdir)/src/common/fs_filter.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fs_filter.cpp
  
  monolib_fs_filter.o: $(srcdir)/src/common/fs_filter.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fs_filter.cpp
  
-monolib_fs_zip.o: $(srcdir)/src/common/fs_zip.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fs_zip.cpp
-
  monolib_hash.o: $(srcdir)/src/common/hash.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/hash.cpp
  
  monolib_hash.o: $(srcdir)/src/common/hash.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/hash.cpp
  
@@ -16405,6 +17528,12 @@ monolib_stream.o: $(srcdir)/src/common/stream.cpp $(MONOLIB_ODEP)
  monolib_string.o: $(srcdir)/src/common/string.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/string.cpp
  
  monolib_string.o: $(srcdir)/src/common/string.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/string.cpp
  
+monolib_stringimpl.o: $(srcdir)/src/common/stringimpl.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/stringimpl.cpp
+
+monolib_strvararg.o: $(srcdir)/src/common/strvararg.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/strvararg.cpp
+
  monolib_sysopt.o: $(srcdir)/src/common/sysopt.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/sysopt.cpp
  
  monolib_sysopt.o: $(srcdir)/src/common/sysopt.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/sysopt.cpp
  
@@ -16423,6 +17552,9 @@ monolib_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(MONOLIB_ODEP)
  monolib_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(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
  
+monolib_unichar.o: $(srcdir)/src/common/unichar.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/unichar.cpp
+
  monolib_uri.o: $(srcdir)/src/common/uri.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/uri.cpp
  
  monolib_uri.o: $(srcdir)/src/common/uri.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/uri.cpp
  
@@ -16432,8 +17564,11 @@ monolib_variant.o: $(srcdir)/src/common/variant.cpp $(MONOLIB_ODEP)
  monolib_wfstream.o: $(srcdir)/src/common/wfstream.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/wfstream.cpp
  
  monolib_wfstream.o: $(srcdir)/src/common/wfstream.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/wfstream.cpp
  
-monolib_wxchar.o: $(srcdir)/src/common/wxchar.cpp $(MONOLIB_ODEP)
-       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/wxchar.cpp
+monolib_wxcrt.o: $(srcdir)/src/common/wxcrt.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/wxcrt.cpp
+
+monolib_wxprintf.o: $(srcdir)/src/common/wxprintf.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/wxprintf.cpp
  
  monolib_xti.o: $(srcdir)/src/common/xti.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/xti.cpp
  
  monolib_xti.o: $(srcdir)/src/common/xti.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/xti.cpp
@@ -16567,6 +17702,9 @@ monolib_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONOLIB_ODEP)
  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_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/collpane.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
  
@@ -16624,6 +17762,9 @@ monolib_textctrlce.o: $(srcdir)/src/msw/wince/textctrlce.cpp $(MONOLIB_ODEP)
  monolib_aga.o: $(srcdir)/src/mac/carbon/aga.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/aga.cpp
  
  monolib_aga.o: $(srcdir)/src/mac/carbon/aga.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/aga.cpp
  
+monolib_artmac.o: $(srcdir)/src/mac/carbon/artmac.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/artmac.cpp
+
  monolib_dccg.o: $(srcdir)/src/mac/carbon/dccg.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/dccg.cpp
  
  monolib_dccg.o: $(srcdir)/src/mac/carbon/dccg.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/dccg.cpp
  
@@ -16636,6 +17777,9 @@ monolib_notebmac.o: $(srcdir)/src/mac/carbon/notebmac.cpp $(MONOLIB_ODEP)
  monolib_printmac.o: $(srcdir)/src/mac/carbon/printmac.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/printmac.cpp
  
  monolib_printmac.o: $(srcdir)/src/mac/carbon/printmac.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/printmac.cpp
  
+monolib_srchctrl.o: $(srcdir)/src/mac/carbon/srchctrl.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/srchctrl.cpp
+
  monolib_statbrma.o: $(srcdir)/src/mac/carbon/statbrma.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/statbrma.cpp
  
  monolib_statbrma.o: $(srcdir)/src/mac/carbon/statbrma.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/statbrma.cpp
  
@@ -16870,6 +18014,9 @@ monolib_xh_choicbk.o: $(srcdir)/src/xrc/xh_choicbk.cpp $(MONOLIB_ODEP)
  monolib_xh_clrpicker.o: $(srcdir)/src/xrc/xh_clrpicker.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_clrpicker.cpp
  
  monolib_xh_clrpicker.o: $(srcdir)/src/xrc/xh_clrpicker.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_clrpicker.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_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp
  
  monolib_xh_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp
  
@@ -17041,6 +18188,15 @@ monolib_richtextstyledlg.o: $(srcdir)/src/richtext/richtextstyledlg.cpp $(MONOLI
  monolib_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp
  
  monolib_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp
  
+monolib_stc.o: $(srcdir)/src/stc/stc.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/stc/stc.cpp
+
+monolib_PlatWX.o: $(srcdir)/src/stc/PlatWX.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/stc/PlatWX.cpp
+
+monolib_ScintillaWX.o: $(srcdir)/src/stc/ScintillaWX.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/stc/ScintillaWX.cpp
+
  monolib_xml.o: $(srcdir)/src/xml/xml.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xml/xml.cpp
  
  monolib_xml.o: $(srcdir)/src/xml/xml.cpp $(MONOLIB_ODEP)
         $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xml/xml.cpp
  
@@ -17149,6 +18305,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @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
  
  @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
  
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monolib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
+
  @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@monolib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONOLIB_ODEP)
  @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
  
  @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@monolib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONOLIB_ODEP)
  @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
  
@@ -17164,9 +18323,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_PLATFORM_MACOSX_1_TOOLKIT_@monolib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONOLIB_ODEP)
  @COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
  
  @COND_PLATFORM_MACOSX_1_TOOLKIT_@monolib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONOLIB_ODEP)
  @COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
  
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(MONOLIB_ODEP)
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/snglinst.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
  
  @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
  
@@ -17383,9 +18539,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @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
  
  @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
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_main.o: $(srcdir)/src/gtk/main.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/main.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
  
  @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
  
@@ -17659,6 +18812,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @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
  
  @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
  
+@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
+
  @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
  
  @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
  
@@ -18442,6 +19598,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_gdiobj.o: $(srcdir)/src/mac/carbon/gdiobj.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/gdiobj.cpp
  
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_gdiobj.o: $(srcdir)/src/mac/carbon/gdiobj.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/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_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@monolib_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
  
@@ -18559,8 +19721,17 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1@monolib_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1@monolib_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp
  
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/gsockx11.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@monolib_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.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_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
@@ -18568,6 +19739,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @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_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_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_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_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_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
  
@@ -18577,6 +19754,15 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @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_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_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_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@monolib_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@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_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
  
@@ -19747,6 +20933,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @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_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_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_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_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
  
@@ -19777,6 +20966,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @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
  
+@COND_USE_GUI_1@monolib_btncmn.o: $(srcdir)/src/common/btncmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/btncmn.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
  
@@ -19822,6 +21014,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@monolib_dcgraph.o: $(srcdir)/src/common/dcgraph.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dcgraph.cpp
  
  @COND_USE_GUI_1@monolib_dcgraph.o: $(srcdir)/src/common/dcgraph.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dcgraph.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_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
  
@@ -19870,6 +21065,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@monolib_fontmap.o: $(srcdir)/src/common/fontmap.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontmap.cpp
  
  @COND_USE_GUI_1@monolib_fontmap.o: $(srcdir)/src/common/fontmap.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontmap.cpp
  
+@COND_USE_GUI_1@monolib_fontutilcmn.o: $(srcdir)/src/common/fontutilcmn.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fontutilcmn.cpp
+
  @COND_USE_GUI_1@monolib_framecmn.o: $(srcdir)/src/common/framecmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/framecmn.cpp
  
  @COND_USE_GUI_1@monolib_framecmn.o: $(srcdir)/src/common/framecmn.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/framecmn.cpp
  
@@ -19927,6 +21125,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@monolib_imagpnm.o: $(srcdir)/src/common/imagpnm.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/imagpnm.cpp
  
  @COND_USE_GUI_1@monolib_imagpnm.o: $(srcdir)/src/common/imagpnm.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/imagpnm.cpp
  
+@COND_USE_GUI_1@monolib_imagtga.o: $(srcdir)/src/common/imagtga.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/imagtga.cpp
+
  @COND_USE_GUI_1@monolib_imagtiff.o: $(srcdir)/src/common/imagtiff.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/imagtiff.cpp
  
  @COND_USE_GUI_1@monolib_imagtiff.o: $(srcdir)/src/common/imagtiff.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/imagtiff.cpp
  
@@ -19984,9 +21185,15 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @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_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_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_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_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_stockitem.o: $(srcdir)/src/common/stockitem.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/stockitem.cpp
  
  @COND_USE_GUI_1@monolib_stockitem.o: $(srcdir)/src/common/stockitem.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/stockitem.cpp
  
@@ -20035,6 +21242,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  @COND_USE_GUI_1@monolib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
+@COND_USE_GUI_1@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
  @COND_USE_GUI_1@monolib_combog.o: $(srcdir)/src/generic/combog.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/combog.cpp
  
  @COND_USE_GUI_1@monolib_combog.o: $(srcdir)/src/generic/combog.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/combog.cpp
  
@@ -20086,6 +21296,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@monolib_splitter.o: $(srcdir)/src/generic/splitter.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp
  
  @COND_USE_GUI_1@monolib_splitter.o: $(srcdir)/src/generic/splitter.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp
  
+@COND_USE_GUI_1@monolib_srchctlg.o: $(srcdir)/src/generic/srchctlg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/srchctlg.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
  
@@ -20113,18 +21326,21 @@ 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_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_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_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.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_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/calctrl.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_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/calctrl.cpp
  
-@COND_USE_GUI_1@monolib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.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
  
@@ -20143,8 +21359,8 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@monolib_helpext.o: $(srcdir)/src/generic/helpext.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/helpext.cpp
  
  @COND_USE_GUI_1@monolib_helpext.o: $(srcdir)/src/generic/helpext.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/helpext.cpp
  
-@COND_USE_GUI_1@monolib_hyperlink.o: $(srcdir)/src/generic/hyperlink.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/hyperlink.cpp
+@COND_USE_GUI_1@monolib_hyperlinkg.o: $(srcdir)/src/generic/hyperlinkg.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/hyperlinkg.cpp
  
  @COND_USE_GUI_1@monolib_laywin.o: $(srcdir)/src/generic/laywin.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/laywin.cpp
  
  @COND_USE_GUI_1@monolib_laywin.o: $(srcdir)/src/generic/laywin.cpp $(MONOLIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/laywin.cpp
@@ -20167,33 +21383,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @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
  
-@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_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_MAC_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MAC_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_MOTIF_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
-@COND_TOOLKIT_X11_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
-@COND_TOOLKIT_PM_USE_GUI_1@monolib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_PM_USE_GUI_1@    $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
  @COND_TOOLKIT_MSW_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
  
  @COND_TOOLKIT_MSW_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
  
@@ -20218,6 +21407,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_X11_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
  
  @COND_TOOLKIT_X11_USE_GUI_1@monolib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_X11_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_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_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
  
@@ -20263,6 +21455,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_X11_USE_GUI_1@monolib_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@monolib_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_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@   $(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_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
  
@@ -20284,15 +21479,18 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_X11_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
  
  @COND_TOOLKIT_X11_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(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_animate.o: $(srcdir)/src/gtk/animate.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/animate.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_animate.o: $(srcdir)/src/gtk/animate.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/animate.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp
-
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dataview.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/dataview.cpp
  
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_hyperlink.o: $(srcdir)/src/gtk/hyperlink.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/hyperlink.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@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk/eggtrayicon.c
  
  @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@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk/eggtrayicon.c
  
@@ -20317,6 +21515,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_mediactrl_wmp10.o: $(srcdir)/src/msw/mediactrl_wmp10.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_wmp10.cpp
  
  @COND_TOOLKIT_WINCE_USE_GUI_1@monolib_mediactrl_wmp10.o: $(srcdir)/src/msw/mediactrl_wmp10.cpp $(MONOLIB_ODEP)
  @COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_wmp10.cpp
  
+@COND_TOOLKIT_MSW_USE_GUI_1@monolib_mediactrl_qt.o: $(srcdir)/src/msw/mediactrl_qt.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_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_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
  
@@ -20345,7 +21549,7 @@ 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_58)  $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_61) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1
  
  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
@@ -20359,6 +21563,9 @@ basedll_arcfind.o: $(srcdir)/src/common/arcfind.cpp $(BASEDLL_ODEP)
  basedll_archive.o: $(srcdir)/src/common/archive.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/archive.cpp
  
  basedll_archive.o: $(srcdir)/src/common/archive.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/archive.cpp
  
+basedll_arrstr.o: $(srcdir)/src/common/arrstr.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/arrstr.cpp
+
  basedll_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/clntdata.cpp
  
  basedll_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/clntdata.cpp
  
@@ -20431,9 +21638,6 @@ basedll_fs_arc.o: $(srcdir)/src/common/fs_arc.cpp $(BASEDLL_ODEP)
  basedll_fs_filter.o: $(srcdir)/src/common/fs_filter.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fs_filter.cpp
  
  basedll_fs_filter.o: $(srcdir)/src/common/fs_filter.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fs_filter.cpp
  
-basedll_fs_zip.o: $(srcdir)/src/common/fs_zip.cpp $(BASEDLL_ODEP)
-       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fs_zip.cpp
-
  basedll_hash.o: $(srcdir)/src/common/hash.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/hash.cpp
  
  basedll_hash.o: $(srcdir)/src/common/hash.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/hash.cpp
  
@@ -20503,6 +21707,12 @@ basedll_stream.o: $(srcdir)/src/common/stream.cpp $(BASEDLL_ODEP)
  basedll_string.o: $(srcdir)/src/common/string.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/string.cpp
  
  basedll_string.o: $(srcdir)/src/common/string.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/string.cpp
  
+basedll_stringimpl.o: $(srcdir)/src/common/stringimpl.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/stringimpl.cpp
+
+basedll_strvararg.o: $(srcdir)/src/common/strvararg.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/strvararg.cpp
+
  basedll_sysopt.o: $(srcdir)/src/common/sysopt.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/sysopt.cpp
  
  basedll_sysopt.o: $(srcdir)/src/common/sysopt.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/sysopt.cpp
  
@@ -20521,6 +21731,9 @@ basedll_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(BASEDLL_ODEP)
  basedll_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(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
  
+basedll_unichar.o: $(srcdir)/src/common/unichar.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/unichar.cpp
+
  basedll_uri.o: $(srcdir)/src/common/uri.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/uri.cpp
  
  basedll_uri.o: $(srcdir)/src/common/uri.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/uri.cpp
  
@@ -20530,8 +21743,11 @@ basedll_variant.o: $(srcdir)/src/common/variant.cpp $(BASEDLL_ODEP)
  basedll_wfstream.o: $(srcdir)/src/common/wfstream.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/wfstream.cpp
  
  basedll_wfstream.o: $(srcdir)/src/common/wfstream.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/wfstream.cpp
  
-basedll_wxchar.o: $(srcdir)/src/common/wxchar.cpp $(BASEDLL_ODEP)
-       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/wxchar.cpp
+basedll_wxcrt.o: $(srcdir)/src/common/wxcrt.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/wxcrt.cpp
+
+basedll_wxprintf.o: $(srcdir)/src/common/wxprintf.cpp $(BASEDLL_ODEP)
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/wxprintf.cpp
  
  basedll_xti.o: $(srcdir)/src/common/xti.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/xti.cpp
  
  basedll_xti.o: $(srcdir)/src/common/xti.cpp $(BASEDLL_ODEP)
         $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/xti.cpp
@@ -20725,6 +21941,9 @@ basedll_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_UNIX_1@basedll_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@basedll_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_MACOSX_1_TOOLKIT_MAC@basedll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
+
  @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@basedll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
  
  @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@basedll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASEDLL_ODEP)
  @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
  
@@ -20947,6 +22166,9 @@ baselib_arcfind.o: $(srcdir)/src/common/arcfind.cpp $(BASELIB_ODEP)
  baselib_archive.o: $(srcdir)/src/common/archive.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/archive.cpp
  
  baselib_archive.o: $(srcdir)/src/common/archive.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/archive.cpp
  
+baselib_arrstr.o: $(srcdir)/src/common/arrstr.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/arrstr.cpp
+
  baselib_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/clntdata.cpp
  
  baselib_clntdata.o: $(srcdir)/src/common/clntdata.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/clntdata.cpp
  
@@ -21019,9 +22241,6 @@ baselib_fs_arc.o: $(srcdir)/src/common/fs_arc.cpp $(BASELIB_ODEP)
  baselib_fs_filter.o: $(srcdir)/src/common/fs_filter.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/fs_filter.cpp
  
  baselib_fs_filter.o: $(srcdir)/src/common/fs_filter.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/fs_filter.cpp
  
-baselib_fs_zip.o: $(srcdir)/src/common/fs_zip.cpp $(BASELIB_ODEP)
-       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/fs_zip.cpp
-
  baselib_hash.o: $(srcdir)/src/common/hash.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/hash.cpp
  
  baselib_hash.o: $(srcdir)/src/common/hash.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/hash.cpp
  
@@ -21091,6 +22310,12 @@ baselib_stream.o: $(srcdir)/src/common/stream.cpp $(BASELIB_ODEP)
  baselib_string.o: $(srcdir)/src/common/string.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/string.cpp
  
  baselib_string.o: $(srcdir)/src/common/string.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/string.cpp
  
+baselib_stringimpl.o: $(srcdir)/src/common/stringimpl.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/stringimpl.cpp
+
+baselib_strvararg.o: $(srcdir)/src/common/strvararg.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/strvararg.cpp
+
  baselib_sysopt.o: $(srcdir)/src/common/sysopt.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/sysopt.cpp
  
  baselib_sysopt.o: $(srcdir)/src/common/sysopt.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/sysopt.cpp
  
@@ -21109,6 +22334,9 @@ baselib_tokenzr.o: $(srcdir)/src/common/tokenzr.cpp $(BASELIB_ODEP)
  baselib_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(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
  
+baselib_unichar.o: $(srcdir)/src/common/unichar.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/unichar.cpp
+
  baselib_uri.o: $(srcdir)/src/common/uri.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/uri.cpp
  
  baselib_uri.o: $(srcdir)/src/common/uri.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/uri.cpp
  
@@ -21118,8 +22346,11 @@ baselib_variant.o: $(srcdir)/src/common/variant.cpp $(BASELIB_ODEP)
  baselib_wfstream.o: $(srcdir)/src/common/wfstream.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/wfstream.cpp
  
  baselib_wfstream.o: $(srcdir)/src/common/wfstream.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/wfstream.cpp
  
-baselib_wxchar.o: $(srcdir)/src/common/wxchar.cpp $(BASELIB_ODEP)
-       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/wxchar.cpp
+baselib_wxcrt.o: $(srcdir)/src/common/wxcrt.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/wxcrt.cpp
+
+baselib_wxprintf.o: $(srcdir)/src/common/wxprintf.cpp $(BASELIB_ODEP)
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/wxprintf.cpp
  
  baselib_xti.o: $(srcdir)/src/common/xti.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/xti.cpp
  
  baselib_xti.o: $(srcdir)/src/common/xti.cpp $(BASELIB_ODEP)
         $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/xti.cpp
@@ -21313,6 +22544,9 @@ baselib_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_UNIX_1@baselib_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@baselib_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_MACOSX_1_TOOLKIT_MAC@baselib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
+
  @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@baselib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
  
  @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@baselib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/snglinst.cpp
  
@@ -21524,7 +22758,7 @@ baselib_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASELIB_ODEP)
  @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
  
  netdll_version_rc.o: $(srcdir)/src/msw/version.rc $(NETDLL_ODEP)
  @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/unix/utilsunx.cpp
  
  netdll_version_rc.o: $(srcdir)/src/msw/version.rc $(NETDLL_ODEP)
-       $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58)  $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_61) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --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
@@ -21629,7 +22863,7 @@ netlib_net.o: $(srcdir)/src/msw/wince/net.cpp $(NETLIB_ODEP)
  @COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/gsocket.cpp
  
  coredll_version_rc.o: $(srcdir)/src/msw/version.rc $(COREDLL_ODEP)
  @COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/gsocket.cpp
  
  coredll_version_rc.o: $(srcdir)/src/msw/version.rc $(COREDLL_ODEP)
-       $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58)  $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_61) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --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
@@ -21658,6 +22892,9 @@ coredll_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(COREDLL_ODEP)
  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_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/collpane.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
  
@@ -21715,6 +22952,9 @@ coredll_textctrlce.o: $(srcdir)/src/msw/wince/textctrlce.cpp $(COREDLL_ODEP)
  coredll_aga.o: $(srcdir)/src/mac/carbon/aga.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/aga.cpp
  
  coredll_aga.o: $(srcdir)/src/mac/carbon/aga.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/aga.cpp
  
+coredll_artmac.o: $(srcdir)/src/mac/carbon/artmac.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/artmac.cpp
+
  coredll_dccg.o: $(srcdir)/src/mac/carbon/dccg.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/dccg.cpp
  
  coredll_dccg.o: $(srcdir)/src/mac/carbon/dccg.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/dccg.cpp
  
@@ -21727,15 +22967,15 @@ coredll_notebmac.o: $(srcdir)/src/mac/carbon/notebmac.cpp $(COREDLL_ODEP)
  coredll_printmac.o: $(srcdir)/src/mac/carbon/printmac.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/printmac.cpp
  
  coredll_printmac.o: $(srcdir)/src/mac/carbon/printmac.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/printmac.cpp
  
+coredll_srchctrl.o: $(srcdir)/src/mac/carbon/srchctrl.cpp $(COREDLL_ODEP)
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/srchctrl.cpp
+
  coredll_statbrma.o: $(srcdir)/src/mac/carbon/statbrma.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/statbrma.cpp
  
  coredll_statlmac.o: $(srcdir)/src/mac/carbon/statlmac.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/statlmac.cpp
  
  coredll_statbrma.o: $(srcdir)/src/mac/carbon/statbrma.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/statbrma.cpp
  
  coredll_statlmac.o: $(srcdir)/src/mac/carbon/statlmac.cpp $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/statlmac.cpp
  
-coredll_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/unix/snglinst.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_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(COREDLL_ODEP)
         $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm
  
@@ -21859,9 +23099,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @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
  
  @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
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_main.o: $(srcdir)/src/gtk/main.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/main.cpp
-
  @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
  
  @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
  
@@ -22138,6 +23375,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @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
  
  @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
  
+@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
+
  @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
  
  @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
  
@@ -22921,6 +24161,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_gdiobj.o: $(srcdir)/src/mac/carbon/gdiobj.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/gdiobj.cpp
  
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_gdiobj.o: $(srcdir)/src/mac/carbon/gdiobj.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/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_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@coredll_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
  
@@ -23038,8 +24284,17 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1@coredll_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1@coredll_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(COREDLL_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp
  
-@COND_TOOLKIT_X11_USE_GUI_1@coredll_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/gsockx11.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@coredll_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.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_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
@@ -23047,6 +24302,12 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @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_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_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_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_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_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
  
@@ -23056,6 +24317,15 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @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_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_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_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@coredll_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@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_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
  
@@ -24223,6 +25493,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @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
  
+@COND_USE_GUI_1@coredll_btncmn.o: $(srcdir)/src/common/btncmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/btncmn.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
  
@@ -24268,6 +25541,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@coredll_dcgraph.o: $(srcdir)/src/common/dcgraph.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dcgraph.cpp
  
  @COND_USE_GUI_1@coredll_dcgraph.o: $(srcdir)/src/common/dcgraph.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dcgraph.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_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
  
@@ -24316,6 +25592,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@coredll_fontmap.o: $(srcdir)/src/common/fontmap.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontmap.cpp
  
  @COND_USE_GUI_1@coredll_fontmap.o: $(srcdir)/src/common/fontmap.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontmap.cpp
  
+@COND_USE_GUI_1@coredll_fontutilcmn.o: $(srcdir)/src/common/fontutilcmn.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/fontutilcmn.cpp
+
  @COND_USE_GUI_1@coredll_framecmn.o: $(srcdir)/src/common/framecmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/framecmn.cpp
  
  @COND_USE_GUI_1@coredll_framecmn.o: $(srcdir)/src/common/framecmn.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/framecmn.cpp
  
@@ -24373,6 +25652,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@coredll_imagpnm.o: $(srcdir)/src/common/imagpnm.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/imagpnm.cpp
  
  @COND_USE_GUI_1@coredll_imagpnm.o: $(srcdir)/src/common/imagpnm.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/imagpnm.cpp
  
+@COND_USE_GUI_1@coredll_imagtga.o: $(srcdir)/src/common/imagtga.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/imagtga.cpp
+
  @COND_USE_GUI_1@coredll_imagtiff.o: $(srcdir)/src/common/imagtiff.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/imagtiff.cpp
  
  @COND_USE_GUI_1@coredll_imagtiff.o: $(srcdir)/src/common/imagtiff.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/imagtiff.cpp
  
@@ -24430,9 +25712,15 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @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_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_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_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_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_stockitem.o: $(srcdir)/src/common/stockitem.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/stockitem.cpp
  
  @COND_USE_GUI_1@coredll_stockitem.o: $(srcdir)/src/common/stockitem.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/stockitem.cpp
  
@@ -24481,6 +25769,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  @COND_USE_GUI_1@coredll_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
+@COND_USE_GUI_1@coredll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
  @COND_USE_GUI_1@coredll_combog.o: $(srcdir)/src/generic/combog.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/combog.cpp
  
  @COND_USE_GUI_1@coredll_combog.o: $(srcdir)/src/generic/combog.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/combog.cpp
  
@@ -24532,6 +25823,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@coredll_splitter.o: $(srcdir)/src/generic/splitter.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp
  
  @COND_USE_GUI_1@coredll_splitter.o: $(srcdir)/src/generic/splitter.cpp $(COREDLL_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp
  
+@COND_USE_GUI_1@coredll_srchctlg.o: $(srcdir)/src/generic/srchctlg.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/srchctlg.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
  
@@ -24580,6 +25874,9 @@ corelib_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(CORELIB_ODEP)
  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_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/collpane.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
  
@@ -24637,6 +25934,9 @@ corelib_textctrlce.o: $(srcdir)/src/msw/wince/textctrlce.cpp $(CORELIB_ODEP)
  corelib_aga.o: $(srcdir)/src/mac/carbon/aga.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/aga.cpp
  
  corelib_aga.o: $(srcdir)/src/mac/carbon/aga.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/aga.cpp
  
+corelib_artmac.o: $(srcdir)/src/mac/carbon/artmac.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/artmac.cpp
+
  corelib_dccg.o: $(srcdir)/src/mac/carbon/dccg.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/dccg.cpp
  
  corelib_dccg.o: $(srcdir)/src/mac/carbon/dccg.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/dccg.cpp
  
@@ -24649,15 +25949,15 @@ corelib_notebmac.o: $(srcdir)/src/mac/carbon/notebmac.cpp $(CORELIB_ODEP)
  corelib_printmac.o: $(srcdir)/src/mac/carbon/printmac.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/printmac.cpp
  
  corelib_printmac.o: $(srcdir)/src/mac/carbon/printmac.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/printmac.cpp
  
+corelib_srchctrl.o: $(srcdir)/src/mac/carbon/srchctrl.cpp $(CORELIB_ODEP)
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/srchctrl.cpp
+
  corelib_statbrma.o: $(srcdir)/src/mac/carbon/statbrma.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/statbrma.cpp
  
  corelib_statlmac.o: $(srcdir)/src/mac/carbon/statlmac.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/statlmac.cpp
  
  corelib_statbrma.o: $(srcdir)/src/mac/carbon/statbrma.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/statbrma.cpp
  
  corelib_statlmac.o: $(srcdir)/src/mac/carbon/statlmac.cpp $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/statlmac.cpp
  
-corelib_snglinst.o: $(srcdir)/src/unix/snglinst.cpp $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/unix/snglinst.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_webkit.o: $(srcdir)/src/html/htmlctrl/webkit/webkit.mm $(CORELIB_ODEP)
         $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/html/htmlctrl/webkit/webkit.mm
  
@@ -24781,9 +26081,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @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
  
  @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
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_main.o: $(srcdir)/src/gtk/main.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/main.cpp
-
  @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
  
  @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
  
@@ -25060,6 +26357,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @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
  
  @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
  
+@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
+
  @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
  
  @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
  
@@ -25843,6 +27143,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_gdiobj.o: $(srcdir)/src/mac/carbon/gdiobj.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/gdiobj.cpp
  
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_gdiobj.o: $(srcdir)/src/mac/carbon/gdiobj.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/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_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@corelib_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
  
@@ -25960,8 +27266,17 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1@corelib_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp
  
  @COND_TOOLKIT_COCOA_USE_GUI_1@corelib_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(CORELIB_ODEP)
  @COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp
  
-@COND_TOOLKIT_X11_USE_GUI_1@corelib_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/gsockx11.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_gsocketiohandler.o: $(srcdir)/src/common/gsocketiohandler.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/gsocketiohandler.cpp
+
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.cpp
+
+@COND_TOOLKIT_DFB_USE_GUI_1@corelib_selectdispatcher.o: $(srcdir)/src/common/selectdispatcher.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_DFB_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/selectdispatcher.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_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
@@ -25969,6 +27284,12 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @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_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_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_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_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_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
  
@@ -25978,6 +27299,15 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @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_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_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_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@corelib_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@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_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
  
@@ -27145,6 +28475,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @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
  
+@COND_USE_GUI_1@corelib_btncmn.o: $(srcdir)/src/common/btncmn.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/btncmn.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
  
@@ -27190,6 +28523,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@corelib_dcgraph.o: $(srcdir)/src/common/dcgraph.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/dcgraph.cpp
  
  @COND_USE_GUI_1@corelib_dcgraph.o: $(srcdir)/src/common/dcgraph.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/dcgraph.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_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
  
@@ -27238,6 +28574,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@corelib_fontmap.o: $(srcdir)/src/common/fontmap.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontmap.cpp
  
  @COND_USE_GUI_1@corelib_fontmap.o: $(srcdir)/src/common/fontmap.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontmap.cpp
  
+@COND_USE_GUI_1@corelib_fontutilcmn.o: $(srcdir)/src/common/fontutilcmn.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/fontutilcmn.cpp
+
  @COND_USE_GUI_1@corelib_framecmn.o: $(srcdir)/src/common/framecmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/framecmn.cpp
  
  @COND_USE_GUI_1@corelib_framecmn.o: $(srcdir)/src/common/framecmn.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/framecmn.cpp
  
@@ -27295,6 +28634,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@corelib_imagpnm.o: $(srcdir)/src/common/imagpnm.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/imagpnm.cpp
  
  @COND_USE_GUI_1@corelib_imagpnm.o: $(srcdir)/src/common/imagpnm.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/imagpnm.cpp
  
+@COND_USE_GUI_1@corelib_imagtga.o: $(srcdir)/src/common/imagtga.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/imagtga.cpp
+
  @COND_USE_GUI_1@corelib_imagtiff.o: $(srcdir)/src/common/imagtiff.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/imagtiff.cpp
  
  @COND_USE_GUI_1@corelib_imagtiff.o: $(srcdir)/src/common/imagtiff.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/imagtiff.cpp
  
@@ -27352,9 +28694,15 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @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_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_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_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_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_stockitem.o: $(srcdir)/src/common/stockitem.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/stockitem.cpp
  
  @COND_USE_GUI_1@corelib_stockitem.o: $(srcdir)/src/common/stockitem.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/stockitem.cpp
  
@@ -27403,6 +28751,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
  @COND_USE_GUI_1@corelib_clrpickerg.o: $(srcdir)/src/generic/clrpickerg.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/clrpickerg.cpp
  
+@COND_USE_GUI_1@corelib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.cpp
+
  @COND_USE_GUI_1@corelib_combog.o: $(srcdir)/src/generic/combog.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/combog.cpp
  
  @COND_USE_GUI_1@corelib_combog.o: $(srcdir)/src/generic/combog.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/combog.cpp
  
@@ -27454,6 +28805,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@corelib_splitter.o: $(srcdir)/src/generic/splitter.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp
  
  @COND_USE_GUI_1@corelib_splitter.o: $(srcdir)/src/generic/splitter.cpp $(CORELIB_ODEP)
  @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp
  
+@COND_USE_GUI_1@corelib_srchctlg.o: $(srcdir)/src/generic/srchctlg.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/srchctlg.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
  
@@ -27476,7 +28830,7 @@ 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_58)  $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_61) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_ADV
  
  advdll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound_sdl.cpp
  
  advdll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound_sdl.cpp
@@ -27487,18 +28841,21 @@ advdll_animatecmn.o: $(srcdir)/src/common/animatecmn.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_hyperlnkcmn.o: $(srcdir)/src/common/hyperlnkcmn.cpp $(ADVDLL_ODEP)
+       $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/common/hyperlnkcmn.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_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP)
+       $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+
  advdll_bmpcboxg.o: $(srcdir)/src/generic/bmpcboxg.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/bmpcboxg.cpp
  
  advdll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/calctrl.cpp
  
  advdll_bmpcboxg.o: $(srcdir)/src/generic/bmpcboxg.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/bmpcboxg.cpp
  
  advdll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/calctrl.cpp
  
-advdll_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(ADVDLL_ODEP)
-       $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/collpaneg.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
  
@@ -27517,8 +28874,8 @@ advdll_gridsel.o: $(srcdir)/src/generic/gridsel.cpp $(ADVDLL_ODEP)
  advdll_helpext.o: $(srcdir)/src/generic/helpext.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/helpext.cpp
  
  advdll_helpext.o: $(srcdir)/src/generic/helpext.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/helpext.cpp
  
-advdll_hyperlink.o: $(srcdir)/src/generic/hyperlink.cpp $(ADVDLL_ODEP)
-       $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/hyperlink.cpp
+advdll_hyperlinkg.o: $(srcdir)/src/generic/hyperlinkg.cpp $(ADVDLL_ODEP)
+       $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/hyperlinkg.cpp
  
  advdll_laywin.o: $(srcdir)/src/generic/laywin.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/laywin.cpp
  
  advdll_laywin.o: $(srcdir)/src/generic/laywin.cpp $(ADVDLL_ODEP)
         $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/laywin.cpp
@@ -27541,33 +28898,6 @@ advdll_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(ADVDLL_ODEP)
  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
  
-@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_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_MAC@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_MAC@     $(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_MOTIF@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
-@COND_TOOLKIT_X11@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
-@COND_TOOLKIT_PM@advdll_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_PM@      $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
  @COND_TOOLKIT_MSW@advdll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
  
  @COND_TOOLKIT_MSW@advdll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
  
@@ -27592,6 +28922,9 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_X11@advdll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
  
  @COND_TOOLKIT_X11@advdll_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_X11@     $(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_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.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
  
@@ -27625,6 +28958,9 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
  @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_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_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_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_PM@advdll_sound.o: $(srcdir)/src/os2/sound.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_PM@      $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/os2/sound.cpp
  
@@ -27661,6 +28997,9 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_X11@advdll_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@advdll_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVDLL_ODEP)
  @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@     $(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_PM@advdll_joystick.o: $(srcdir)/src/os2/joystick.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_PM@      $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/os2/joystick.cpp
  
@@ -27685,15 +29024,18 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_X11@advdll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
  
  @COND_TOOLKIT_X11@advdll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_X11@     $(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_animate.o: $(srcdir)/src/gtk/animate.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/animate.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_animate.o: $(srcdir)/src/gtk/animate.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/animate.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp
-
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/dataview.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(ADVDLL_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/dataview.cpp
  
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_hyperlink.o: $(srcdir)/src/gtk/hyperlink.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/hyperlink.cpp
+
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advdll_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@advdll_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
  
@@ -27715,18 +29057,21 @@ advlib_animatecmn.o: $(srcdir)/src/common/animatecmn.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_hyperlnkcmn.o: $(srcdir)/src/common/hyperlnkcmn.cpp $(ADVLIB_ODEP)
+       $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/common/hyperlnkcmn.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_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP)
+       $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
+
  advlib_bmpcboxg.o: $(srcdir)/src/generic/bmpcboxg.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/bmpcboxg.cpp
  
  advlib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/calctrl.cpp
  
  advlib_bmpcboxg.o: $(srcdir)/src/generic/bmpcboxg.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/bmpcboxg.cpp
  
  advlib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/calctrl.cpp
  
-advlib_collpaneg.o: $(srcdir)/src/generic/collpaneg.cpp $(ADVLIB_ODEP)
-       $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/collpaneg.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
  
@@ -27745,8 +29090,8 @@ advlib_gridsel.o: $(srcdir)/src/generic/gridsel.cpp $(ADVLIB_ODEP)
  advlib_helpext.o: $(srcdir)/src/generic/helpext.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/helpext.cpp
  
  advlib_helpext.o: $(srcdir)/src/generic/helpext.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/helpext.cpp
  
-advlib_hyperlink.o: $(srcdir)/src/generic/hyperlink.cpp $(ADVLIB_ODEP)
-       $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/hyperlink.cpp
+advlib_hyperlinkg.o: $(srcdir)/src/generic/hyperlinkg.cpp $(ADVLIB_ODEP)
+       $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/hyperlinkg.cpp
  
  advlib_laywin.o: $(srcdir)/src/generic/laywin.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/laywin.cpp
  
  advlib_laywin.o: $(srcdir)/src/generic/laywin.cpp $(ADVLIB_ODEP)
         $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/laywin.cpp
@@ -27769,33 +29114,6 @@ advlib_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp $(ADVLIB_ODEP)
  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
  
-@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_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_MAC@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_MAC@     $(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_MOTIF@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@    $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
-@COND_TOOLKIT_X11@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
-@COND_TOOLKIT_PM@advlib_animateg.o: $(srcdir)/src/generic/animateg.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_PM@      $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/animateg.cpp
-
  @COND_TOOLKIT_MSW@advlib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
  
  @COND_TOOLKIT_MSW@advlib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
  
@@ -27820,6 +29138,9 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_X11@advlib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/common/taskbarcmn.cpp
  
  @COND_TOOLKIT_X11@advlib_taskbarcmn.o: $(srcdir)/src/common/taskbarcmn.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_X11@     $(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_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.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
  
@@ -27853,6 +29174,9 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
  @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_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_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_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_PM@advlib_sound.o: $(srcdir)/src/os2/sound.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_PM@      $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/os2/sound.cpp
  
@@ -27889,6 +29213,9 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_X11@advlib_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@advlib_joystick.o: $(srcdir)/src/unix/joystick.cpp $(ADVLIB_ODEP)
  @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@     $(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_PM@advlib_joystick.o: $(srcdir)/src/os2/joystick.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_PM@      $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/os2/joystick.cpp
  
@@ -27913,15 +29240,18 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_X11@advlib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/taskbarx11.cpp
  
  @COND_TOOLKIT_X11@advlib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_X11@     $(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_animate.o: $(srcdir)/src/gtk/animate.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/animate.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_animate.o: $(srcdir)/src/gtk/animate.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/animate.cpp
  
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_collpane.o: $(srcdir)/src/gtk/collpane.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/collpane.cpp
-
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/dataview.cpp
  
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/dataview.cpp
  
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_hyperlink.o: $(srcdir)/src/gtk/hyperlink.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@   $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/hyperlink.cpp
+
  @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@advlib_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@advlib_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
  
@@ -27935,7 +29265,7 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
  @COND_TOOLKIT_WINCE_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp
  
  mediadll_version_rc.o: $(srcdir)/src/msw/version.rc $(MEDIADLL_ODEP)
  @COND_TOOLKIT_WINCE_WXUNIV_0@  $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/datectrl.cpp
  
  mediadll_version_rc.o: $(srcdir)/src/msw/version.rc $(MEDIADLL_ODEP)
-       $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58)  $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_61) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --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
@@ -27952,6 +29282,12 @@ mediadll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIADLL_ODEP)
  @COND_TOOLKIT_WINCE@mediadll_mediactrl_wmp10.o: $(srcdir)/src/msw/mediactrl_wmp10.cpp $(MEDIADLL_ODEP)
  @COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_wmp10.cpp
  
  @COND_TOOLKIT_WINCE@mediadll_mediactrl_wmp10.o: $(srcdir)/src/msw/mediactrl_wmp10.cpp $(MEDIADLL_ODEP)
  @COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(MEDIADLL_CXXFLAGS) $(srcdir)/src/msw/mediactrl_wmp10.cpp
  
+@COND_TOOLKIT_MSW@mediadll_mediactrl_qt.o: $(srcdir)/src/msw/mediactrl_qt.cpp $(MEDIADLL_ODEP)
+@COND_TOOLKIT_MSW@     $(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_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
  
@@ -27988,6 +29324,12 @@ medialib_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIALIB_ODEP)
  @COND_TOOLKIT_WINCE@medialib_mediactrl_wmp10.o: $(srcdir)/src/msw/mediactrl_wmp10.cpp $(MEDIALIB_ODEP)
  @COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_wmp10.cpp
  
  @COND_TOOLKIT_WINCE@medialib_mediactrl_wmp10.o: $(srcdir)/src/msw/mediactrl_wmp10.cpp $(MEDIALIB_ODEP)
  @COND_TOOLKIT_WINCE@   $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/msw/mediactrl_wmp10.cpp
  
+@COND_TOOLKIT_MSW@medialib_mediactrl_qt.o: $(srcdir)/src/msw/mediactrl_qt.cpp $(MEDIALIB_ODEP)
+@COND_TOOLKIT_MSW@     $(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_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
  
@@ -28010,7 +29352,7 @@ medialib_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MEDIALIB_ODEP)
  @COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
  
  odbcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(ODBCDLL_ODEP)
  @COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(MEDIALIB_CXXFLAGS) $(srcdir)/src/unix/mediactrl.cpp
  
  odbcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(ODBCDLL_ODEP)
-       $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58)  $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_61) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_ODBC
  
  odbcdll_db.o: $(srcdir)/src/common/db.cpp $(ODBCDLL_ODEP)
         $(CXXC) -c -o $@ $(ODBCDLL_CXXFLAGS) $(srcdir)/src/common/db.cpp
  
  odbcdll_db.o: $(srcdir)/src/common/db.cpp $(ODBCDLL_ODEP)
         $(CXXC) -c -o $@ $(ODBCDLL_CXXFLAGS) $(srcdir)/src/common/db.cpp
@@ -28025,7 +29367,7 @@ odbclib_dbtable.o: $(srcdir)/src/common/dbtable.cpp $(ODBCLIB_ODEP)
         $(CXXC) -c -o $@ $(ODBCLIB_CXXFLAGS) $(srcdir)/src/common/dbtable.cpp
  
  dbgriddll_version_rc.o: $(srcdir)/src/msw/version.rc $(DBGRIDDLL_ODEP)
         $(CXXC) -c -o $@ $(ODBCLIB_CXXFLAGS) $(srcdir)/src/common/dbtable.cpp
  
  dbgriddll_version_rc.o: $(srcdir)/src/msw/version.rc $(DBGRIDDLL_ODEP)
-       $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58)  $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_61) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_DBGRID
  
  dbgriddll_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp $(DBGRIDDLL_ODEP)
         $(CXXC) -c -o $@ $(DBGRIDDLL_CXXFLAGS) $(srcdir)/src/common/dbgrid.cpp
  
  dbgriddll_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp $(DBGRIDDLL_ODEP)
         $(CXXC) -c -o $@ $(DBGRIDDLL_CXXFLAGS) $(srcdir)/src/common/dbgrid.cpp
@@ -28034,7 +29376,7 @@ dbgridlib_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp $(DBGRIDLIB_ODEP)
         $(CXXC) -c -o $@ $(DBGRIDLIB_CXXFLAGS) $(srcdir)/src/common/dbgrid.cpp
  
  htmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(HTMLDLL_ODEP)
         $(CXXC) -c -o $@ $(DBGRIDLIB_CXXFLAGS) $(srcdir)/src/common/dbgrid.cpp
  
  htmldll_version_rc.o: $(srcdir)/src/msw/version.rc $(HTMLDLL_ODEP)
-       $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58)  $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_61) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --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
@@ -28193,7 +29535,7 @@ htmllib_htmllbox.o: $(srcdir)/src/generic/htmllbox.cpp $(HTMLLIB_ODEP)
  @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp
  
  qadll_version_rc.o: $(srcdir)/src/msw/version.rc $(QADLL_ODEP)
  @COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/chm.cpp
  
  qadll_version_rc.o: $(srcdir)/src/msw/version.rc $(QADLL_ODEP)
-       $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58)  $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_61) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --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
@@ -28208,7 +29550,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_58)  $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXDLLNAME=$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_61) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --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
@@ -28223,7 +29565,7 @@ 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_58)  $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_61) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --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
@@ -28258,6 +29600,9 @@ 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_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_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(XRCDLL_ODEP)
         $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp
  
@@ -28420,6 +29765,9 @@ 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_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_combo.o: $(srcdir)/src/xrc/xh_combo.cpp $(XRCLIB_ODEP)
         $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_combo.cpp
  
@@ -28550,7 +29898,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_58)  $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_61) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --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
@@ -28583,7 +29931,7 @@ 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)
         $(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_58)  $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_61) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT
  
  richtextdll_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(RICHTEXTDLL_ODEP)
         $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp
  
  richtextdll_richtextctrl.o: $(srcdir)/src/richtext/richtextctrl.cpp $(RICHTEXTDLL_ODEP)
         $(CXXC) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(srcdir)/src/richtext/richtextctrl.cpp
@@ -28639,8 +29987,32 @@ richtextlib_richtextstyledlg.o: $(srcdir)/src/richtext/richtextstyledlg.cpp $(RI
  richtextlib_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(RICHTEXTLIB_ODEP)
         $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp
  
  richtextlib_richtextprint.o: $(srcdir)/src/richtext/richtextprint.cpp $(RICHTEXTLIB_ODEP)
         $(CXXC) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(srcdir)/src/richtext/richtextprint.cpp
  
+stcdll_version_rc.o: $(srcdir)/src/msw/version.rc $(STCDLL_ODEP)
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_61) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --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_PlatWX.o: $(srcdir)/src/stc/PlatWX.cpp $(STCDLL_ODEP)
+       $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/src/stc/PlatWX.cpp
+
+stcdll_ScintillaWX.o: $(srcdir)/src/stc/ScintillaWX.cpp $(STCDLL_ODEP)
+       $(CXXC) -c -o $@ $(STCDLL_CXXFLAGS) $(srcdir)/src/stc/ScintillaWX.cpp
+
+stclib_stc.o: $(srcdir)/src/stc/stc.cpp $(STCLIB_ODEP)
+       $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/src/stc/stc.cpp
+
+stclib_PlatWX.o: $(srcdir)/src/stc/PlatWX.cpp $(STCLIB_ODEP)
+       $(CXXC) -c -o $@ $(STCLIB_CXXFLAGS) $(srcdir)/src/stc/PlatWX.cpp
+
+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)
  gldll_version_rc.o: $(srcdir)/src/msw/version.rc $(GLDLL_ODEP)
-       $(WINDRES) -i$< -o$@   --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_58)  $(__EXCEPTIONS_DEFINE_p_57) $(__RTTI_DEFINE_p_57) $(__THREAD_DEFINE_p_57)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include
+       $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_62)  $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61)   --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_61) $(__INC_JPEG_p_62) $(__INC_PNG_p_61) $(__INC_ZLIB_p_63) $(__INC_ODBC_p_61) $(__INC_REGEX_p_61) $(__INC_EXPAT_p_61) --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
  
  @COND_TOOLKIT_MAC@gldll_glcanvas.o: $(srcdir)/src/mac/carbon/glcanvas.cpp $(GLDLL_ODEP)
  @COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/glcanvas.cpp
  
  @COND_TOOLKIT_MAC@gldll_glcanvas.o: $(srcdir)/src/mac/carbon/glcanvas.cpp $(GLDLL_ODEP)
  @COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/glcanvas.cpp
@@ -28669,6 +30041,9 @@ gldll_version_rc.o: $(srcdir)/src/msw/version.rc $(GLDLL_ODEP)
  @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_PM@gldll_glcanvas.o: $(srcdir)/src/os2/glcanvas.cpp $(GLDLL_ODEP)
  @COND_TOOLKIT_PM@      $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $(srcdir)/src/os2/glcanvas.cpp
  
+gllib_glcmn.o: $(srcdir)/src/common/glcmn.cpp $(GLLIB_ODEP)
+       $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/common/glcmn.cpp
+
  @COND_TOOLKIT_MAC@gllib_glcanvas.o: $(srcdir)/src/mac/carbon/glcanvas.cpp $(GLLIB_ODEP)
  @COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/glcanvas.cpp
  
  @COND_TOOLKIT_MAC@gllib_glcanvas.o: $(srcdir)/src/mac/carbon/glcanvas.cpp $(GLLIB_ODEP)
  @COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/glcanvas.cpp
  
@@ -28717,6 +30092,7 @@ 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
+STCDIR =   $(WXDIR)/src/stc
  UNIXDIR  = $(WXDIR)/src/unix
  PNGDIR   = $(WXDIR)/src/png
  JPEGDIR  = $(WXDIR)/src/jpeg
  UNIXDIR  = $(WXDIR)/src/unix
  PNGDIR   = $(WXDIR)/src/png
  JPEGDIR  = $(WXDIR)/src/jpeg
@@ -28833,7 +30209,9 @@ ALL_DIST: distrib_clean
         # copy some files from include/ that are not installed:
         mkdir $(DISTDIR)/include
         mkdir $(DISTDIR)/include/wx
         # copy some files from include/ that are not installed:
         mkdir $(DISTDIR)/include
         mkdir $(DISTDIR)/include/wx
+       mkdir $(DISTDIR)/include/wx/private
         $(CP_P) $(INCDIR)/wx/fmappriv.h $(DISTDIR)/include/wx
         $(CP_P) $(INCDIR)/wx/fmappriv.h $(DISTDIR)/include/wx
+       $(CP_P) $(INCDIR)/wx/private/*.h $(DISTDIR)/include/wx/private
         # copy wxpresets
         mkdir $(DISTDIR)/build
         mkdir $(DISTDIR)/build/bakefiles
         # copy wxpresets
         mkdir $(DISTDIR)/build
         mkdir $(DISTDIR)/build/bakefiles
@@ -28858,10 +30236,15 @@ ALL_GUI_DIST: ALL_DIST
         if test -f $(DOCDIR)/$(TOOLKITDIR)/todo.txt ; then \
           $(CP_P) $(DOCDIR)/$(TOOLKITDIR)/todo.txt $(DISTDIR)/TODO.txt ; fi
         mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR)
         if test -f $(DOCDIR)/$(TOOLKITDIR)/todo.txt ; then \
           $(CP_P) $(DOCDIR)/$(TOOLKITDIR)/todo.txt $(DISTDIR)/TODO.txt ; fi
         mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR)
+       if test -d $(INCDIR)/wx/$(TOOLKITDIR)/private; then \
+           mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR)/private && \
+           $(CP_P) $(INCDIR)/wx/$(TOOLKITDIR)/private/*.h $(DISTDIR)/include/wx/$(TOOLKITDIR)/private; \
+       fi
         mkdir $(DISTDIR)/include/wx/generic
         mkdir $(DISTDIR)/include/wx/html
         mkdir $(DISTDIR)/include/wx/richtext
         mkdir $(DISTDIR)/include/wx/aui
         mkdir $(DISTDIR)/include/wx/generic
         mkdir $(DISTDIR)/include/wx/html
         mkdir $(DISTDIR)/include/wx/richtext
         mkdir $(DISTDIR)/include/wx/aui
+       mkdir $(DISTDIR)/include/wx/stc
         mkdir $(DISTDIR)/include/wx/protocol
         mkdir $(DISTDIR)/include/wx/unix
         mkdir $(DISTDIR)/include/wx/xml
         mkdir $(DISTDIR)/include/wx/protocol
         mkdir $(DISTDIR)/include/wx/unix
         mkdir $(DISTDIR)/include/wx/xml
@@ -28872,6 +30255,7 @@ ALL_GUI_DIST: ALL_DIST
         $(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/stc/*.h $(DISTDIR)/include/wx/stc
         $(CP_P) $(INCDIR)/wx/unix/*.h $(DISTDIR)/include/wx/unix
         $(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/xml/*.h $(DISTDIR)/include/wx/xml
         $(CP_P) $(INCDIR)/wx/xrc/*.h $(DISTDIR)/include/wx/xrc
@@ -28886,6 +30270,7 @@ ALL_GUI_DIST: ALL_DIST
         mkdir $(DISTDIR)/src/html
         mkdir $(DISTDIR)/src/richtext
         mkdir $(DISTDIR)/src/aui
         mkdir $(DISTDIR)/src/html
         mkdir $(DISTDIR)/src/richtext
         mkdir $(DISTDIR)/src/aui
+       mkdir $(DISTDIR)/src/stc
         mkdir $(DISTDIR)/src/$(TOOLKITDIR)
         mkdir $(DISTDIR)/src/png
         mkdir $(DISTDIR)/src/jpeg
         mkdir $(DISTDIR)/src/$(TOOLKITDIR)
         mkdir $(DISTDIR)/src/png
         mkdir $(DISTDIR)/src/jpeg
@@ -28904,6 +30289,7 @@ ALL_GUI_DIST: ALL_DIST
         $(CP_P) $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
         $(CP_P) $(RICHTEXTDIR)/*.cpp $(DISTDIR)/src/richtext
         $(CP_P) $(AUIDIR)/*.cpp $(DISTDIR)/src/aui
         $(CP_P) $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
         $(CP_P) $(RICHTEXTDIR)/*.cpp $(DISTDIR)/src/richtext
         $(CP_P) $(AUIDIR)/*.cpp $(DISTDIR)/src/aui
+       $(CP_P) $(STCDIR)/*.cpp $(DISTDIR)/src/stc
         $(CP_P) $(PNGDIR)/*.h $(DISTDIR)/src/png
         $(CP_P) $(PNGDIR)/*.c $(DISTDIR)/src/png
         $(CP_P) $(PNGDIR)/README $(DISTDIR)/src/png
         $(CP_P) $(PNGDIR)/*.h $(DISTDIR)/src/png
         $(CP_P) $(PNGDIR)/*.c $(DISTDIR)/src/png
         $(CP_P) $(PNGDIR)/README $(DISTDIR)/src/png
@@ -28931,6 +30317,7 @@ 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/stc
         mkdir $(DISTDIR)/include/wx/mac
         mkdir $(DISTDIR)/include/wx/mac/carbon
         mkdir $(DISTDIR)/include/wx/mac/corefoundation
         mkdir $(DISTDIR)/include/wx/mac
         mkdir $(DISTDIR)/include/wx/mac/carbon
         mkdir $(DISTDIR)/include/wx/mac/corefoundation
@@ -29020,6 +30407,8 @@ GTK_DIST: UNIV_DIST
  X11_DIST: UNIV_DIST
         $(CP_P) $(WXDIR)/wxX11.spec $(DISTDIR)
         $(CP_P) $(INCDIR)/wx/x11/*.h $(DISTDIR)/include/wx/x11
  X11_DIST: UNIV_DIST
         $(CP_P) $(WXDIR)/wxX11.spec $(DISTDIR)
         $(CP_P) $(INCDIR)/wx/x11/*.h $(DISTDIR)/include/wx/x11
+       mkdir $(DISTDIR)/include/wx/gtk/private
+       $(CP_P) $(INCDIR)/wx/gtk/private/string.h $(DISTDIR)/include/wx/gtk/private
         $(CP_P) $(X11DIR)/*.cpp $(DISTDIR)/src/x11
         $(CP_P) $(X11DIR)/*.c $(DISTDIR)/src/x11
         $(CP_P) $(X11DIR)/*.xbm $(DISTDIR)/src/x11
         $(CP_P) $(X11DIR)/*.cpp $(DISTDIR)/src/x11
         $(CP_P) $(X11DIR)/*.c $(DISTDIR)/src/x11
         $(CP_P) $(X11DIR)/*.xbm $(DISTDIR)/src/x11
@@ -29543,4 +30932,4 @@ rpm: bzip-dist
  # Include dependency info, if present:
  @IF_GNU_MAKE@-include .deps/*.d
  
  # Include dependency info, if present:
  @IF_GNU_MAKE@-include .deps/*.d
  
-.PHONY: all install uninstall clean distclean install_wxregex install_wxzlib install_wxpng install_wxjpeg install_wxtiff install_wxodbc install_wxexpat install_monodll install_monolib install_basedll install_baselib install_netdll install_netlib install_coredll install_corelib install_advdll install_advlib install_mediadll install_medialib install_odbcdll install_odbclib install_dbgriddll install_dbgridlib install_htmldll install_htmllib install_qadll install_qalib install_xmldll install_xmllib install_xrcdll install_xrclib install_auidll install_auilib install_richtextdll install_richtextlib install_gldll install_gllib install_sound_sdl samples
+.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_wxodbc uninstall_wxodbc 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_odbcdll uninstall_odbcdll install_odbclib uninstall_odbclib install_dbgriddll uninstall_dbgriddll install_dbgridlib uninstall_dbgridlib wxdbgrid 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