removed virtual from functions which are not; expanded wxWindow description

[wxWidgets.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 2de0253208e031e34e2c351580df29065255e05d..e45622d5203a03a76f869b346cd9726dc5f5eeed 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,6 +20,7 @@ DEREZ = @DEREZ@
 DLLPREFIX = @DLLPREFIX@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
+EXTRALIBS_HTML = @EXTRALIBS_HTML@
 EXTRALIBS_ODBC = @EXTRALIBS_ODBC@
 EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
 EXTRALIBS_XML = @EXTRALIBS_XML@
@@ -52,11 +53,10 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
-ADVDLL_CXXFLAGS = $(__advdll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_ADV $(CXXFLAGS) \
-       $(PIC_FLAG)
+ADVDLL_CXXFLAGS = $(__advdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DWXUSINGDLL -DWXMAKINGDLL_ADV $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
 ADVDLL_OBJECTS =  \
        advdll_calctrl.o \
        advdll_dcbuffer.o \
@@ -70,10 +70,10 @@ ADVDLL_OBJECTS =  \
        advdll_tipdlg.o \
        advdll_wizard.o \
        $(__ADVANCED_PLATFORM_SRC_OBJECTS_2)
-ADVLIB_CXXFLAGS = $(__advlib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CXXFLAGS)
+ADVLIB_CXXFLAGS = $(__advlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       $(CPPFLAGS) $(CXXFLAGS)
 ADVLIB_OBJECTS =  \
        advlib_calctrl.o \
        advlib_dcbuffer.o \
@@ -109,11 +109,13 @@ ALL_BASE_HEADERS =  \
        wx/debug.h \
        wx/defs.h \
        wx/dir.h \
+       wx/dlimpexp.h \
        wx/dynarray.h \
        wx/dynlib.h \
        wx/dynload.h \
        wx/encconv.h \
        wx/event.h \
+       wx/except.h \
        wx/features.h \
        wx/ffile.h \
        wx/file.h \
@@ -125,6 +127,7 @@ ALL_BASE_HEADERS =  \
        wx/fontmap.h \
        wx/fs_mem.h \
        wx/fs_zip.h \
+       wx/gzstream.h \
        wx/hash.h \
        wx/hashmap.h \
        wx/hashset.h \
@@ -157,6 +160,7 @@ ALL_BASE_HEADERS =  \
        wx/regex.h \
        wx/scopeguard.h \
        wx/snglinst.h \
+       wx/stack.h \
        wx/stopwatch.h \
        wx/strconv.h \
        wx/stream.h \
@@ -222,6 +226,7 @@ ALL_BASE_SOURCES =  \
        src/common/filesys.cpp \
        src/common/fmapbase.cpp \
        src/common/fs_zip.cpp \
+       src/common/gzstream.cpp \
        src/common/hash.cpp \
        src/common/hashmap.cpp \
        src/common/init.cpp \
@@ -318,16 +323,16 @@ ALL_BASE_SOURCES =  \
 ALL_HEADERS =  \
        $(ALL_BASE_HEADERS) \
        $(ALL_GUI_HEADERS)
-BASEDLL_CFLAGS = $(__basedll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE \
-       -DwxUSE_BASE=1 $(CFLAGS) $(PIC_FLAG)
-BASEDLL_CXXFLAGS = $(__basedll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+BASEDLL_CFLAGS = $(__basedll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 $(PIC_FLAG) $(CPPFLAGS) \
+       $(CFLAGS)
+BASEDLL_CXXFLAGS = $(__basedll_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
        $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
        $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE \
-       -DwxUSE_BASE=1 $(CXXFLAGS) $(PIC_FLAG)
+       -DwxUSE_BASE=1 $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
 BASEDLL_OBJECTS =  \
        basedll_appbase.o \
        basedll_clntdata.o \
@@ -349,6 +354,7 @@ BASEDLL_OBJECTS =  \
        basedll_filesys.o \
        basedll_fmapbase.o \
        basedll_fs_zip.o \
+       basedll_gzstream.o \
        basedll_hash.o \
        basedll_hashmap.o \
        basedll_init.o \
@@ -388,14 +394,15 @@ BASEDLL_OBJECTS =  \
        basedll_utilscmn.o \
        $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2) \
        $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_2)
-BASELIB_CFLAGS = $(__baselib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+BASELIB_CFLAGS = $(__baselib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
+BASELIB_CXXFLAGS = $(__baselib_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
        $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CFLAGS)
-BASELIB_CXXFLAGS = $(__baselib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CXXFLAGS)
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) \
+       $(CXXFLAGS)
 BASELIB_OBJECTS =  \
        baselib_appbase.o \
        baselib_clntdata.o \
@@ -417,6 +424,7 @@ BASELIB_OBJECTS =  \
        baselib_filesys.o \
        baselib_fmapbase.o \
        baselib_fs_zip.o \
+       baselib_gzstream.o \
        baselib_hash.o \
        baselib_hashmap.o \
        baselib_init.o \
@@ -456,16 +464,16 @@ BASELIB_OBJECTS =  \
        baselib_utilscmn.o \
        $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3) \
        $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3)
-COREDLL_CFLAGS = $(__coredll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+COREDLL_CFLAGS = $(__coredll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 $(PIC_FLAG) $(CPPFLAGS) \
+       $(CFLAGS)
+COREDLL_CXXFLAGS = $(__coredll_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
        $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
        $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_CORE \
-       -DwxUSE_BASE=0 $(CFLAGS) $(PIC_FLAG)
-COREDLL_CXXFLAGS = $(__coredll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_CORE \
-       -DwxUSE_BASE=0 $(CXXFLAGS) $(PIC_FLAG)
+       -DwxUSE_BASE=0 $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
 COREDLL_OBJECTS =  \
        coredll_event.o \
        coredll_fs_mem.o \
@@ -474,14 +482,14 @@ COREDLL_OBJECTS =  \
        $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4) \
        $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4) \
        $(__CORE_SRC_OBJECTS_2)
-CORELIB_CFLAGS = $(__corelib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=0 $(CFLAGS)
-CORELIB_CXXFLAGS = $(__corelib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+CORELIB_CFLAGS = $(__corelib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DwxUSE_BASE=0 $(CPPFLAGS) $(CFLAGS)
+CORELIB_CXXFLAGS = $(__corelib_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
        $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=0 $(CXXFLAGS)
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=0 $(CPPFLAGS) $(CXXFLAGS)
 CORELIB_OBJECTS =  \
        corelib_event.o \
        corelib_fs_mem.o \
@@ -490,37 +498,37 @@ CORELIB_OBJECTS =  \
        $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5) \
        $(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5) \
        $(__CORE_SRC_OBJECTS_3)
-DBGRIDDLL_CXXFLAGS = $(__dbgriddll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+DBGRIDDLL_CXXFLAGS = $(__dbgriddll_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
        $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
        $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_DBGRID \
-       $(CXXFLAGS) $(PIC_FLAG)
+       $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
 DBGRIDDLL_OBJECTS =  \
        dbgriddll_dbgrid.o
-DBGRIDLIB_CXXFLAGS = $(__dbgridlib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+DBGRIDLIB_CXXFLAGS = $(__dbgridlib_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
        $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CXXFLAGS)
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CXXFLAGS)
 DBGRIDLIB_OBJECTS =  \
        dbgridlib_dbgrid.o
-GLDLL_CXXFLAGS = $(__gldll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_GL $(CXXFLAGS) \
-       $(PIC_FLAG)
+DESTDIR = 
+GLDLL_CXXFLAGS = $(__gldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DWXUSINGDLL -DWXMAKINGDLL_GL $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
 GLDLL_OBJECTS =  \
        $(__OPENGL_SRC_OBJECTS)
-GLLIB_CXXFLAGS = $(__gllib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CXXFLAGS)
+GLLIB_CXXFLAGS = $(__gllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       $(CPPFLAGS) $(CXXFLAGS)
 GLLIB_OBJECTS =  \
        $(__OPENGL_SRC_OBJECTS_1)
-HTMLDLL_CXXFLAGS = $(__htmldll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+HTMLDLL_CXXFLAGS = $(__htmldll_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
        $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
        $(__INC_REGEX_p) $(__INC_EXPAT_p) -DWXUSINGDLL -DWXMAKINGDLL_HTML \
-       $(CXXFLAGS) $(PIC_FLAG)
+       $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
 HTMLDLL_OBJECTS =  \
        $(__HTML_SRC_PLATFORM_OBJECTS_2) \
        htmldll_helpctrl.o \
@@ -544,10 +552,10 @@ HTMLDLL_OBJECTS =  \
        htmldll_m_tables.o \
        htmldll_winpars.o \
        htmldll_htmllbox.o
-HTMLLIB_CXXFLAGS = $(__htmllib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+HTMLLIB_CXXFLAGS = $(__htmllib_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
        $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CXXFLAGS)
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) $(CPPFLAGS) $(CXXFLAGS)
 HTMLLIB_OBJECTS =  \
        $(__HTML_SRC_PLATFORM_OBJECTS_3) \
        htmllib_helpctrl.o \
@@ -573,16 +581,15 @@ HTMLLIB_OBJECTS =  \
        htmllib_htmllbox.o
 LIBDIRNAME = $(top_builddir)lib
 LOCALE_LINGUAS = ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk zh zh_CN zh_TW
-MONODLL_CFLAGS = $(__monodll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+MONODLL_CFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) $(CPPFLAGS) $(CFLAGS)
+MONODLL_CXXFLAGS = $(__monodll_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
        $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=1 -DWXMAKINGDLL $(CFLAGS) \
-       $(PIC_FLAG)
-MONODLL_CXXFLAGS = $(__monodll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=1 -DWXMAKINGDLL $(CXXFLAGS) \
-       $(PIC_FLAG)
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=1 -DWXMAKINGDLL $(PIC_FLAG) \
+       $(CPPFLAGS) $(CXXFLAGS)
 MONODLL_OBJECTS =  \
        monodll_appbase.o \
        monodll_clntdata.o \
@@ -604,6 +611,7 @@ MONODLL_OBJECTS =  \
        monodll_filesys.o \
        monodll_fmapbase.o \
        monodll_fs_zip.o \
+       monodll_gzstream.o \
        monodll_hash.o \
        monodll_hashmap.o \
        monodll_init.o \
@@ -657,14 +665,14 @@ MONODLL_OBJECTS =  \
        $(__MONOLIB_GUI_SRC_OBJECTS) \
        monodll_xml.o \
        monodll_xtixml.o
-MONOLIB_CFLAGS = $(__monolib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=1 $(CFLAGS)
-MONOLIB_CXXFLAGS = $(__monolib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+MONOLIB_CFLAGS = $(__monolib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS)
+MONOLIB_CXXFLAGS = $(__monolib_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
        $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=1 $(CXXFLAGS)
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_BASE=1 $(CPPFLAGS) $(CXXFLAGS)
 MONOLIB_OBJECTS =  \
        monolib_appbase.o \
        monolib_clntdata.o \
@@ -686,6 +694,7 @@ MONOLIB_OBJECTS =  \
        monolib_filesys.o \
        monolib_fmapbase.o \
        monolib_fs_zip.o \
+       monolib_gzstream.o \
        monolib_hash.o \
        monolib_hashmap.o \
        monolib_init.o \
@@ -739,16 +748,16 @@ MONOLIB_OBJECTS =  \
        $(__MONOLIB_GUI_SRC_OBJECTS_1) \
        monolib_xml.o \
        monolib_xtixml.o
-NETDLL_CFLAGS = $(__netdll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \
-       -DWXMAKINGDLL_NET $(CFLAGS) $(PIC_FLAG)
-NETDLL_CXXFLAGS = $(__netdll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \
-       -DWXMAKINGDLL_NET $(CXXFLAGS) $(PIC_FLAG)
+NETDLL_CFLAGS = $(__netdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET $(PIC_FLAG) $(CPPFLAGS) \
+       $(CFLAGS)
+NETDLL_CXXFLAGS = $(__netdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET $(PIC_FLAG) $(CPPFLAGS) \
+       $(CXXFLAGS)
 NETDLL_OBJECTS =  \
        netdll_fs_inet.o \
        netdll_ftp.o \
@@ -761,14 +770,14 @@ NETDLL_OBJECTS =  \
        netdll_socket.o \
        netdll_url.o \
        $(__NET_PLATFORM_SRC_OBJECTS_2)
-NETLIB_CFLAGS = $(__netlib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CFLAGS)
-NETLIB_CXXFLAGS = $(__netlib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CXXFLAGS)
+NETLIB_CFLAGS = $(__netlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DwxUSE_GUI=0 $(CPPFLAGS) $(CFLAGS)
+NETLIB_CXXFLAGS = $(__netlib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
 NETLIB_OBJECTS =  \
        netlib_fs_inet.o \
        netlib_ftp.o \
@@ -781,27 +790,27 @@ NETLIB_OBJECTS =  \
        netlib_socket.o \
        netlib_url.o \
        $(__NET_PLATFORM_SRC_OBJECTS_3)
-ODBCDLL_CXXFLAGS = $(__odbcdll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+ODBCDLL_CXXFLAGS = $(__odbcdll_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
        $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
        $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \
-       -DWXMAKINGDLL_ODBC $(CXXFLAGS) $(PIC_FLAG)
+       -DWXMAKINGDLL_ODBC $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
 ODBCDLL_OBJECTS =  \
        odbcdll_db.o \
        odbcdll_dbtable.o
-ODBCLIB_CXXFLAGS = $(__odbclib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+ODBCLIB_CXXFLAGS = $(__odbclib_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
        $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CXXFLAGS)
+       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
 ODBCLIB_OBJECTS =  \
        odbclib_db.o \
        odbclib_dbtable.o
-WXEXPAT_CFLAGS = $(CPPFLAGS)    -I./src/expat $(CFLAGS)
+WXEXPAT_CFLAGS =     -I./src/expat  $(CPPFLAGS) $(CFLAGS)
 WXEXPAT_OBJECTS =  \
        wxexpat_xmlparse.o \
        wxexpat_xmlrole.o \
        wxexpat_xmltok.o
-WXJPEG_CFLAGS = $(CPPFLAGS)    $(CFLAGS)
+WXJPEG_CFLAGS =      $(CPPFLAGS) $(CFLAGS)
 WXJPEG_OBJECTS =  \
        wxjpeg_jcomapi.o \
        wxjpeg_jutils.o \
@@ -849,7 +858,7 @@ WXJPEG_OBJECTS =  \
        wxjpeg_jquant1.o \
        wxjpeg_jquant2.o \
        wxjpeg_jdmerge.o
-WXODBC_CFLAGS = $(CPPFLAGS)    $(CFLAGS)
+WXODBC_CFLAGS =      $(CPPFLAGS) $(CFLAGS)
 WXODBC_OBJECTS =  \
        wxodbc_catalog.o \
        wxodbc_connect.o \
@@ -866,7 +875,7 @@ WXODBC_OBJECTS =  \
        wxodbc_misc.o \
        wxodbc_prepare.o \
        wxodbc_result.o
-WXPNG_CFLAGS = $(CPPFLAGS)    $(__INC_ZLIB_p) $(CFLAGS)
+WXPNG_CFLAGS =     $(__INC_ZLIB_p)  $(CPPFLAGS) $(CFLAGS)
 WXPNG_OBJECTS =  \
        wxpng_png.o \
        wxpng_pngerror.o \
@@ -885,13 +894,13 @@ WXPNG_OBJECTS =  \
        wxpng_pngwrite.o \
        wxpng_pngwtran.o \
        wxpng_pngwutil.o
-WXREGEX_CFLAGS = $(CPPFLAGS)    $(CFLAGS)
+WXREGEX_CFLAGS =      $(CPPFLAGS) $(CFLAGS)
 WXREGEX_OBJECTS =  \
        wxregex_regcomp.o \
        wxregex_regexec.o \
        wxregex_regerror.o \
        wxregex_regfree.o
-WXTIFF_CFLAGS = $(CPPFLAGS)    $(CFLAGS)
+WXTIFF_CFLAGS =      $(CPPFLAGS) $(CFLAGS)
 WXTIFF_OBJECTS =  \
        $(__TIFF_PLATFORM_SRC_OBJECTS) \
        wxtiff_tif_aux.o \
@@ -926,7 +935,7 @@ WXTIFF_OBJECTS =  \
        wxtiff_tif_warning.o \
        wxtiff_tif_write.o \
        wxtiff_tif_zip.o
-WXZLIB_CFLAGS = $(CPPFLAGS)    $(CFLAGS)
+WXZLIB_CFLAGS =      $(CPPFLAGS) $(CFLAGS)
 WXZLIB_OBJECTS =  \
        wxzlib_adler32.o \
        wxzlib_compress.o \
@@ -943,18 +952,18 @@ WXZLIB_OBJECTS =  \
        wxzlib_infutil.o \
        wxzlib_inffast.o
 WX_VERSION = 2.5.1
-XMLDLL_CXXFLAGS = $(__xmldll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL \
-       -DWXMAKINGDLL_XML $(CXXFLAGS) $(PIC_FLAG)
+XMLDLL_CXXFLAGS = $(__xmldll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_XML $(PIC_FLAG) $(CPPFLAGS) \
+       $(CXXFLAGS)
 XMLDLL_OBJECTS =  \
        xmldll_xml.o \
        xmldll_xtixml.o
-XMLLIB_CXXFLAGS = $(__xmllib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) \
-       $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) \
-       $(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CXXFLAGS)
+XMLLIB_CXXFLAGS = $(__xmllib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
+       -DwxUSE_GUI=0 $(CPPFLAGS) $(CXXFLAGS)
 XMLLIB_OBJECTS =  \
        xmllib_xml.o \
        xmllib_xtixml.o
@@ -994,6 +1003,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
        wx/dialog.h \
        wx/dirdlg.h \
        wx/dragimag.h \
+       wx/encinfo.h \
        wx/filedlg.h \
        wx/frame.h \
        wx/gauge.h \
@@ -1121,7 +1131,6 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
        wx/spinbutt.h \
        wx/spinctrl.h \
        wx/splitter.h \
-       wx/stack.h \
        wx/statline.h \
        wx/tab.h \
        wx/tabctrl.h \
@@ -1133,6 +1142,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
        wx/treebase.h \
        wx/treectrl.h \
        wx/valgen.h \
+       wx/vidmode.h \
        wx/vlbox.h \
        wx/vms_x_fix.h \
        wx/vscroll.h \
@@ -1520,6 +1530,7 @@ COND_TOOLKIT_MOTIF_GUI_HDR =  \
        wx/motif/minifram.h \
        wx/motif/msgdlg.h \
        wx/motif/palette.h \
+       wx/motif/popupwin.h \
        wx/motif/print.h \
        wx/motif/private.h \
        wx/motif/radiobox.h \
@@ -1674,6 +1685,7 @@ COND_TOOLKIT_PM_GUI_HDR =  \
        wx/generic/colrdlgg.h \
        wx/generic/dirdlgg.h \
        wx/generic/fdrepdlg.h \
+       wx/generic/listctrl.h \
        wx/generic/mdig.h \
        wx/generic/statusbr.h \
        wx/os2/accel.h \
@@ -1711,7 +1723,6 @@ COND_TOOLKIT_PM_GUI_HDR =  \
        wx/os2/icon.h \
        wx/os2/iniconf.h \
        wx/os2/listbox.h \
-       wx/os2/listctrl.h \
        wx/os2/menu.h \
        wx/os2/menuitem.h \
        wx/os2/metafile.h \
@@ -1743,7 +1754,6 @@ COND_TOOLKIT_PM_GUI_HDR =  \
        wx/os2/toolbar.h \
        wx/os2/tooltip.h \
        wx/os2/toplevel.h \
-       wx/msw/treectrl.h \
        wx/os2/window.h
 @COND_TOOLKIT_PM@GUI_HDR = $(COND_TOOLKIT_PM_GUI_HDR)
 @COND_TOOLKIT_COCOA@LOWLEVEL_HDR = 
@@ -1751,6 +1761,7 @@ COND_TOOLKIT_GTK_LOWLEVEL_HDR =  \
        wx/generic/caret.h \
        wx/unix/fontutil.h \
        wx/unix/utilsx11.h \
+       wx/unix/displayx11.h \
        wx/generic/paletteg.h
 @COND_TOOLKIT_GTK@LOWLEVEL_HDR = $(COND_TOOLKIT_GTK_LOWLEVEL_HDR)
 @COND_TOOLKIT_MAC@LOWLEVEL_HDR = 
@@ -1783,6 +1794,7 @@ COND_TOOLKIT_MOTIF_LOWLEVEL_HDR =  \
        wx/generic/caret.h \
        wx/unix/fontutil.h \
        wx/unix/utilsx11.h \
+       wx/unix/displayx11.h \
        wx/x11/bitmap.h \
        wx/x11/brush.h \
        wx/x11/pen.h \
@@ -1794,6 +1806,7 @@ COND_TOOLKIT_X11_LOWLEVEL_HDR =  \
        wx/generic/caret.h \
        wx/unix/fontutil.h \
        wx/unix/utilsx11.h \
+       wx/unix/displayx11.h \
        wx/x11/app.h \
        wx/x11/bitmap.h \
        wx/x11/brush.h \
@@ -1831,7 +1844,7 @@ COND_TOOLKIT_X11_LOWLEVEL_HDR =  \
 @COND_TOOLKIT_COCOA@NET_PLATFORM_HDR = wx/unix/gsockunx.h
 @COND_TOOLKIT_GTK@OPENGL_HDR = wx/gtk/glcanvas.h
 @COND_TOOLKIT_MAC@OPENGL_HDR = wx/mac/glcanvas.h
-@COND_TOOLKIT_MOTIF@OPENGL_HDR = wx/motif/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_X11@OPENGL_HDR = wx/x11/glcanvas.h
@@ -3187,6 +3200,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS =  \
        monodll_dcmemory.o \
        monodll_dcscreen.o \
        monodll_dialog.o \
+       monodll_evtloop.o \
        monodll_font.o \
        monodll_fontenum.o \
        monodll_fontutil.o \
@@ -3258,7 +3272,6 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS =  \
        monodll_listbox.o \
        monodll_mdi.o \
        monodll_menu.o \
-       monodll_minifram.o \
        monodll_msgdlg.o \
        monodll_notebook.o \
        monodll_radiobox.o \
@@ -3394,6 +3407,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS =  \
        monodll_minifram.o \
        monodll_msgdlg.o \
        monodll_palette.o \
+       monodll_popupwin.o \
        monodll_radiobox.o \
        monodll_radiobut.o \
        monodll_scrolbar.o \
@@ -3424,6 +3438,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS =  \
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS =  \
        monodll_statusbr.o \
+       monodll_prntdlgg.o \
        monodll_accel.o \
        monodll_bmpbuttn.o \
        monodll_button.o \
@@ -3476,6 +3491,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS =  \
        monodll_dirdlgg.o \
        monodll_fdrepdlg.o \
        monodll_imaglist.o \
+       monodll_listctrl.o \
        monodll_mdig.o \
        monodll_msgdlgg.o \
        monodll_prntdlgg.o \
@@ -3503,6 +3519,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS =  \
        monodll_dcscreen.o \
        monodll_dialog.o \
        monodll_dnd.o \
+       monodll_evtloop.o \
        monodll_filedlg.o \
        monodll_font.o \
        monodll_fontdlg.o \
@@ -3517,7 +3534,6 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS =  \
        monodll_icon.o \
        monodll_iniconf.o \
        monodll_listbox.o \
-       monodll_listctrl.o \
        monodll_main.o \
        monodll_menu.o \
        monodll_menuitem.o \
@@ -3547,7 +3563,6 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS =  \
        monodll_toolbar.o \
        monodll_tooltip.o \
        monodll_toplevel.o \
-       monodll_treectrl.o \
        monodll_utilsgui.o \
        monodll_window.o
 @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS)
@@ -3581,6 +3596,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 =  \
        monolib_dcmemory.o \
        monolib_dcscreen.o \
        monolib_dialog.o \
+       monolib_evtloop.o \
        monolib_font.o \
        monolib_fontenum.o \
        monolib_fontutil.o \
@@ -3652,7 +3668,6 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_1 =  \
        monolib_listbox.o \
        monolib_mdi.o \
        monolib_menu.o \
-       monolib_minifram.o \
        monolib_msgdlg.o \
        monolib_notebook.o \
        monolib_radiobox.o \
@@ -3788,6 +3803,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 =  \
        monolib_minifram.o \
        monolib_msgdlg.o \
        monolib_palette.o \
+       monolib_popupwin.o \
        monolib_radiobox.o \
        monolib_radiobut.o \
        monolib_scrolbar.o \
@@ -3818,6 +3834,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 =  \
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_1 =  \
        monolib_statusbr.o \
+       monolib_prntdlgg.o \
        monolib_accel.o \
        monolib_bmpbuttn.o \
        monolib_button.o \
@@ -3870,6 +3887,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1 =  \
        monolib_dirdlgg.o \
        monolib_fdrepdlg.o \
        monolib_imaglist.o \
+       monolib_listctrl.o \
        monolib_mdig.o \
        monolib_msgdlgg.o \
        monolib_prntdlgg.o \
@@ -3897,6 +3915,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1 =  \
        monolib_dcscreen.o \
        monolib_dialog.o \
        monolib_dnd.o \
+       monolib_evtloop.o \
        monolib_filedlg.o \
        monolib_font.o \
        monolib_fontdlg.o \
@@ -3911,7 +3930,6 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1 =  \
        monolib_icon.o \
        monolib_iniconf.o \
        monolib_listbox.o \
-       monolib_listctrl.o \
        monolib_main.o \
        monolib_menu.o \
        monolib_menuitem.o \
@@ -3941,7 +3959,6 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1 =  \
        monolib_toolbar.o \
        monolib_tooltip.o \
        monolib_toplevel.o \
-       monolib_treectrl.o \
        monolib_utilsgui.o \
        monolib_window.o
 @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_1)
@@ -3975,6 +3992,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 =  \
        coredll_dcmemory.o \
        coredll_dcscreen.o \
        coredll_dialog.o \
+       coredll_evtloop.o \
        coredll_font.o \
        coredll_fontenum.o \
        coredll_fontutil.o \
@@ -4046,7 +4064,6 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_2 =  \
        coredll_listbox.o \
        coredll_mdi.o \
        coredll_menu.o \
-       coredll_minifram.o \
        coredll_msgdlg.o \
        coredll_notebook.o \
        coredll_radiobox.o \
@@ -4182,6 +4199,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 =  \
        coredll_minifram.o \
        coredll_msgdlg.o \
        coredll_palette.o \
+       coredll_popupwin.o \
        coredll_radiobox.o \
        coredll_radiobut.o \
        coredll_scrolbar.o \
@@ -4212,6 +4230,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 =  \
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_2 =  \
        coredll_statusbr.o \
+       coredll_prntdlgg.o \
        coredll_accel.o \
        coredll_bmpbuttn.o \
        coredll_button.o \
@@ -4264,6 +4283,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2 =  \
        coredll_dirdlgg.o \
        coredll_fdrepdlg.o \
        coredll_imaglist.o \
+       coredll_listctrl.o \
        coredll_mdig.o \
        coredll_msgdlgg.o \
        coredll_prntdlgg.o \
@@ -4291,6 +4311,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2 =  \
        coredll_dcscreen.o \
        coredll_dialog.o \
        coredll_dnd.o \
+       coredll_evtloop.o \
        coredll_filedlg.o \
        coredll_font.o \
        coredll_fontdlg.o \
@@ -4305,7 +4326,6 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2 =  \
        coredll_icon.o \
        coredll_iniconf.o \
        coredll_listbox.o \
-       coredll_listctrl.o \
        coredll_main.o \
        coredll_menu.o \
        coredll_menuitem.o \
@@ -4335,7 +4355,6 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2 =  \
        coredll_toolbar.o \
        coredll_tooltip.o \
        coredll_toplevel.o \
-       coredll_treectrl.o \
        coredll_utilsgui.o \
        coredll_window.o
 @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_2)
@@ -4369,6 +4388,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 =  \
        corelib_dcmemory.o \
        corelib_dcscreen.o \
        corelib_dialog.o \
+       corelib_evtloop.o \
        corelib_font.o \
        corelib_fontenum.o \
        corelib_fontutil.o \
@@ -4440,7 +4460,6 @@ COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_3 =  \
        corelib_listbox.o \
        corelib_mdi.o \
        corelib_menu.o \
-       corelib_minifram.o \
        corelib_msgdlg.o \
        corelib_notebook.o \
        corelib_radiobox.o \
@@ -4576,6 +4595,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 =  \
        corelib_minifram.o \
        corelib_msgdlg.o \
        corelib_palette.o \
+       corelib_popupwin.o \
        corelib_radiobox.o \
        corelib_radiobut.o \
        corelib_scrolbar.o \
@@ -4606,6 +4626,7 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 =  \
 @COND_TOOLKIT_MOTIF@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3)
 COND_TOOLKIT_MSW___GUI_SRC_OBJECTS_3 =  \
        corelib_statusbr.o \
+       corelib_prntdlgg.o \
        corelib_accel.o \
        corelib_bmpbuttn.o \
        corelib_button.o \
@@ -4658,6 +4679,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3 =  \
        corelib_dirdlgg.o \
        corelib_fdrepdlg.o \
        corelib_imaglist.o \
+       corelib_listctrl.o \
        corelib_mdig.o \
        corelib_msgdlgg.o \
        corelib_prntdlgg.o \
@@ -4685,6 +4707,7 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3 =  \
        corelib_dcscreen.o \
        corelib_dialog.o \
        corelib_dnd.o \
+       corelib_evtloop.o \
        corelib_filedlg.o \
        corelib_font.o \
        corelib_fontdlg.o \
@@ -4699,7 +4722,6 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3 =  \
        corelib_icon.o \
        corelib_iniconf.o \
        corelib_listbox.o \
-       corelib_listctrl.o \
        corelib_main.o \
        corelib_menu.o \
        corelib_menuitem.o \
@@ -4729,13 +4751,20 @@ COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3 =  \
        corelib_toolbar.o \
        corelib_tooltip.o \
        corelib_toplevel.o \
-       corelib_treectrl.o \
        corelib_utilsgui.o \
        corelib_window.o
 @COND_TOOLKIT_PM@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_PM___GUI_SRC_OBJECTS_3)
+@COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o
+@COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS = monodll_chm.o
 @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS = monodll_helpbest.o
+@COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o
+@COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_chm.o
 @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_1 = monolib_helpbest.o
+@COND_PLATFORM_MACOSX_1@__HTML_SRC_PLATFORM_OBJECTS_2 = htmldll_chm.o
+@COND_PLATFORM_UNIX_1@__HTML_SRC_PLATFORM_OBJECTS_2 = htmldll_chm.o
 @COND_TOOLKIT_MSW@__HTML_SRC_PLATFORM_OBJECTS_2 = htmldll_helpbest.o
+@COND_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_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p = -I$(top_srcdir)/src/expat/lib
 @COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg
@@ -4768,6 +4797,7 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS =  \
        monodll_fontenum.o \
        monodll_fontutil.o \
        monodll_utilsx11.o \
+       monodll_displayx11.o \
        monodll_paletteg.o \
        monodll_app.o \
        monodll_bitmap.o \
@@ -4788,6 +4818,7 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS =  \
        monodll_gsockgtk.o \
        monodll_icon.o \
        monodll_main.o \
+       monodll_minifram.o \
        monodll_pen.o \
        monodll_popupwin.o \
        monodll_region.o \
@@ -4836,6 +4867,7 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS =  \
        monodll_fontenum.o \
        monodll_fontutil.o \
        monodll_utilsx11.o \
+       monodll_displayx11.o \
        monodll_bitmap.o \
        monodll_brush.o \
        monodll_pen.o \
@@ -4900,6 +4932,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS =  \
        monodll_fontenum.o \
        monodll_fontutil.o \
        monodll_utilsx11.o \
+       monodll_displayx11.o \
        monodll_timer.o \
        monodll_app.o \
        monodll_bitmap.o \
@@ -4939,6 +4972,7 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_0 =  \
        monolib_fontenum.o \
        monolib_fontutil.o \
        monolib_utilsx11.o \
+       monolib_displayx11.o \
        monolib_paletteg.o \
        monolib_app.o \
        monolib_bitmap.o \
@@ -4959,6 +4993,7 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_0 =  \
        monolib_gsockgtk.o \
        monolib_icon.o \
        monolib_main.o \
+       monolib_minifram.o \
        monolib_pen.o \
        monolib_popupwin.o \
        monolib_region.o \
@@ -5007,6 +5042,7 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_0 =  \
        monolib_fontenum.o \
        monolib_fontutil.o \
        monolib_utilsx11.o \
+       monolib_displayx11.o \
        monolib_bitmap.o \
        monolib_brush.o \
        monolib_pen.o \
@@ -5071,6 +5107,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0 =  \
        monolib_fontenum.o \
        monolib_fontutil.o \
        monolib_utilsx11.o \
+       monolib_displayx11.o \
        monolib_timer.o \
        monolib_app.o \
        monolib_bitmap.o \
@@ -5110,6 +5147,7 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8 =  \
        coredll_fontenum.o \
        coredll_fontutil.o \
        coredll_utilsx11.o \
+       coredll_displayx11.o \
        coredll_paletteg.o \
        coredll_app.o \
        coredll_bitmap.o \
@@ -5130,6 +5168,7 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8 =  \
        coredll_gsockgtk.o \
        coredll_icon.o \
        coredll_main.o \
+       coredll_minifram.o \
        coredll_pen.o \
        coredll_popupwin.o \
        coredll_region.o \
@@ -5178,6 +5217,7 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_8 =  \
        coredll_fontenum.o \
        coredll_fontutil.o \
        coredll_utilsx11.o \
+       coredll_displayx11.o \
        coredll_bitmap.o \
        coredll_brush.o \
        coredll_pen.o \
@@ -5242,6 +5282,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8 =  \
        coredll_fontenum.o \
        coredll_fontutil.o \
        coredll_utilsx11.o \
+       coredll_displayx11.o \
        coredll_timer.o \
        coredll_app.o \
        coredll_bitmap.o \
@@ -5281,6 +5322,7 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9 =  \
        corelib_fontenum.o \
        corelib_fontutil.o \
        corelib_utilsx11.o \
+       corelib_displayx11.o \
        corelib_paletteg.o \
        corelib_app.o \
        corelib_bitmap.o \
@@ -5301,6 +5343,7 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9 =  \
        corelib_gsockgtk.o \
        corelib_icon.o \
        corelib_main.o \
+       corelib_minifram.o \
        corelib_pen.o \
        corelib_popupwin.o \
        corelib_region.o \
@@ -5349,6 +5392,7 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_9 =  \
        corelib_fontenum.o \
        corelib_fontutil.o \
        corelib_utilsx11.o \
+       corelib_displayx11.o \
        corelib_bitmap.o \
        corelib_brush.o \
        corelib_pen.o \
@@ -5413,6 +5457,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9 =  \
        corelib_fontenum.o \
        corelib_fontutil.o \
        corelib_utilsx11.o \
+       corelib_displayx11.o \
        corelib_timer.o \
        corelib_app.o \
        corelib_bitmap.o \
@@ -5570,6 +5615,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
 @COND_TOOLKIT_PM@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
 @COND_TOOLKIT_X11@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
 @COND_PLATFORM_MACOSX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
+@COND_PLATFORM_OS2_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
 @COND_PLATFORM_UNIX_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_unix.o
 @COND_PLATFORM_WIN32_1@__TIFF_PLATFORM_SRC_OBJECTS = wxtiff_tif_win32.o
 @COND_MONOLITHIC_0@__WXLIBGLDEP_BASE_p = \
@@ -6455,6 +6501,9 @@ basedll_fs_mem.o: $(srcdir)/src/common/fs_mem.cpp
 basedll_fs_zip.o: $(srcdir)/src/common/fs_zip.cpp
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
+basedll_gzstream.o: $(srcdir)/src/common/gzstream.cpp
+       $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
 basedll_hash.o: $(srcdir)/src/common/hash.cpp
        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
@@ -6763,6 +6812,9 @@ baselib_fs_mem.o: $(srcdir)/src/common/fs_mem.cpp
 baselib_fs_zip.o: $(srcdir)/src/common/fs_zip.cpp
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
+baselib_gzstream.o: $(srcdir)/src/common/gzstream.cpp
+       $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
 baselib_hash.o: $(srcdir)/src/common/hash.cpp
        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
@@ -7703,6 +7755,15 @@ coredll_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@coredll_display.o: $(srcdir)/src/msw/display.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_GTK_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp
+@COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_X11_USE_GUI_1@coredll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
 @COND_USE_GUI_1@coredll_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -7757,6 +7818,15 @@ coredll_event.o: $(srcdir)/src/common/event.cpp
 @COND_TOOLKIT_GTK_USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp
 @COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_evtloop.o: $(srcdir)/src/os2/evtloop.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MGL_USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_evtloop.o: $(srcdir)/src/motif/evtloop.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -7766,9 +7836,6 @@ coredll_event.o: $(srcdir)/src/common/event.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/msw/evtloop.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_MGL_USE_GUI_1@coredll_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
 @COND_USE_GUI_1@coredll_fddlgcmn.o: $(srcdir)/src/common/fddlgcmn.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -8165,9 +8232,6 @@ coredll_inphand.o: $(srcdir)/src/univ/inphand.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_listbox.o: $(srcdir)/src/mac/listbox.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/os2/listctrl.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/msw/listctrl.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -8183,6 +8247,9 @@ coredll_inphand.o: $(srcdir)/src/univ/inphand.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@coredll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -8288,8 +8355,8 @@ coredll_metal.o: $(srcdir)/src/univ/themes/metal.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_minifram.o: $(srcdir)/src/motif/minifram.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@coredll_minifram.o: $(srcdir)/src/gtk/minifram.cpp
-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+@COND_TOOLKIT_GTK_USE_GUI_1@coredll_minifram.o: $(srcdir)/src/gtk/minifram.cpp
+@COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MSW_USE_GUI_1@coredll_minifram.o: $(srcdir)/src/msw/minifram.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
@@ -8447,6 +8514,9 @@ coredll_pnghand.o: $(srcdir)/src/mac/pnghand.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@coredll_popupwin.o: $(srcdir)/src/msw/popupwin.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_popupwin.o: $(srcdir)/src/motif/popupwin.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
 coredll_print.o: $(srcdir)/src/os2/print.cpp
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -8474,6 +8544,9 @@ coredll_printmac.o: $(srcdir)/src/mac/printmac.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -8975,11 +9048,8 @@ coredll_topluniv.o: $(srcdir)/src/univ/topluniv.cpp
 @COND_USE_GUI_1@coredll_treectlg.o: $(srcdir)/src/generic/treectlg.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_treectrl.o: $(srcdir)/src/os2/treectrl.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@coredll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+coredll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp
+       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
 coredll_uma.o: $(srcdir)/src/mac/uma.cpp
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
@@ -9787,6 +9857,15 @@ corelib_ctrlrend.o: $(srcdir)/src/univ/ctrlrend.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@corelib_display.o: $(srcdir)/src/msw/display.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_GTK_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp
+@COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_X11_USE_GUI_1@corelib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
 @COND_USE_GUI_1@corelib_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -9841,6 +9920,15 @@ corelib_event.o: $(srcdir)/src/common/event.cpp
 @COND_TOOLKIT_GTK_USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp
 @COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_evtloop.o: $(srcdir)/src/os2/evtloop.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MGL_USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_evtloop.o: $(srcdir)/src/motif/evtloop.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -9850,9 +9938,6 @@ corelib_event.o: $(srcdir)/src/common/event.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/msw/evtloop.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_MGL_USE_GUI_1@corelib_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
 @COND_USE_GUI_1@corelib_fddlgcmn.o: $(srcdir)/src/common/fddlgcmn.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -10249,9 +10334,6 @@ corelib_inphand.o: $(srcdir)/src/univ/inphand.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_listbox.o: $(srcdir)/src/mac/listbox.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/os2/listctrl.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/msw/listctrl.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -10267,6 +10349,9 @@ corelib_inphand.o: $(srcdir)/src/univ/inphand.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@corelib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -10372,8 +10457,8 @@ corelib_metal.o: $(srcdir)/src/univ/themes/metal.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_minifram.o: $(srcdir)/src/motif/minifram.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@corelib_minifram.o: $(srcdir)/src/gtk/minifram.cpp
-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+@COND_TOOLKIT_GTK_USE_GUI_1@corelib_minifram.o: $(srcdir)/src/gtk/minifram.cpp
+@COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MSW_USE_GUI_1@corelib_minifram.o: $(srcdir)/src/msw/minifram.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
@@ -10531,6 +10616,9 @@ corelib_pnghand.o: $(srcdir)/src/mac/pnghand.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@corelib_popupwin.o: $(srcdir)/src/msw/popupwin.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_popupwin.o: $(srcdir)/src/motif/popupwin.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
 corelib_print.o: $(srcdir)/src/os2/print.cpp
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -10558,6 +10646,9 @@ corelib_printmac.o: $(srcdir)/src/mac/printmac.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -11059,11 +11150,8 @@ corelib_topluniv.o: $(srcdir)/src/univ/topluniv.cpp
 @COND_USE_GUI_1@corelib_treectlg.o: $(srcdir)/src/generic/treectlg.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_treectrl.o: $(srcdir)/src/os2/treectrl.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@corelib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+corelib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp
+       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
 corelib_uma.o: $(srcdir)/src/mac/uma.cpp
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
@@ -11212,52 +11300,58 @@ distclean: clean
 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ 
 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(__gldll___so_symlinks_cmd)
 
+@COND_TOOLKIT_MOTIF@gldll_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp
+@COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $<
+
 @COND_TOOLKIT_X11@gldll_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp
 @COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_PM@gldll_glcanvas.o: $(srcdir)/src/os2/glcanvas.cpp
-@COND_TOOLKIT_PM@      $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_MOTIF@gldll_glcanvas.o: $(srcdir)/src/motif/glcanvas.cpp
-@COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $<
-
 @COND_TOOLKIT_MAC@gldll_glcanvas.o: $(srcdir)/src/mac/glcanvas.cpp
 @COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_MSW@gldll_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp
-@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $<
+@COND_TOOLKIT_PM@gldll_glcanvas.o: $(srcdir)/src/os2/glcanvas.cpp
+@COND_TOOLKIT_PM@      $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_GTK@gldll_glcanvas.o: $(srcdir)/src/gtk/glcanvas.cpp
 @COND_TOOLKIT_GTK@     $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_MSW@gldll_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp
+@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $<
+
 @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a: $(__gllib_PCH_DEP)  $(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@ $(RANLIB) $@
 
+@COND_TOOLKIT_MOTIF@gllib_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp
+@COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $<
+
 @COND_TOOLKIT_X11@gllib_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp
 @COND_TOOLKIT_X11@     $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_PM@gllib_glcanvas.o: $(srcdir)/src/os2/glcanvas.cpp
-@COND_TOOLKIT_PM@      $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_MOTIF@gllib_glcanvas.o: $(srcdir)/src/motif/glcanvas.cpp
-@COND_TOOLKIT_MOTIF@   $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $<
-
 @COND_TOOLKIT_MAC@gllib_glcanvas.o: $(srcdir)/src/mac/glcanvas.cpp
 @COND_TOOLKIT_MAC@     $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_MSW@gllib_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp
-@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $<
+@COND_TOOLKIT_PM@gllib_glcanvas.o: $(srcdir)/src/os2/glcanvas.cpp
+@COND_TOOLKIT_PM@      $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_GTK@gllib_glcanvas.o: $(srcdir)/src/gtk/glcanvas.cpp
 @COND_TOOLKIT_GTK@     $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_MSW@gllib_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp
+@COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $<
+
 @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__htmldll_PCH_DEP)  $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(SHARED_LD_CXX) $@ $(HTMLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__htmldll___macinstnamecmd) $(__htmldll___importlib) $(__htmldll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(SHARED_LD_CXX) $@ $(HTMLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__htmldll___macinstnamecmd) $(__htmldll___importlib) $(__htmldll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(EXTRALIBS_HTML)
 @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        
 @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(__htmldll___so_symlinks_cmd)
 
+@COND_PLATFORM_UNIX_1@htmldll_chm.o: $(srcdir)/src/html/chm.cpp
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1@htmldll_chm.o: $(srcdir)/src/html/chm.cpp
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $<
+
 htmldll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp
        $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $<
 
@@ -11329,6 +11423,12 @@ htmldll_winpars.o: $(srcdir)/src/html/winpars.cpp
 @COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@        $(AR) rcu $@ $(HTMLLIB_OBJECTS)
 @COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@        $(RANLIB) $@
 
+@COND_PLATFORM_UNIX_1@htmllib_chm.o: $(srcdir)/src/html/chm.cpp
+@COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1@htmllib_chm.o: $(srcdir)/src/html/chm.cpp
+@COND_PLATFORM_MACOSX_1@       $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $<
+
 htmllib_helpbest.o: $(srcdir)/src/msw/helpbest.cpp
        $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $<
 
@@ -11396,16 +11496,16 @@ htmllib_winpars.o: $(srcdir)/src/html/winpars.cpp
        $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $<
 
 install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_afm___depname) $(__install_gsafm___depname) install-wxconfig locale_install $(__macos_res_install___depname) $(__cocoa_res_install___depname)
-       $(INSTALL_DIR) $(datadir)/aclocal
-       (cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(datadir)/aclocal)
-       $(INSTALL_DIR) $(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx
-       (cd ./ ; $(INSTALL_DATA)  lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h $(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx)
-       $(INSTALL_DIR) $(includedir)
+       $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
+       (cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
+       $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx
+       (cd ./ ; $(INSTALL_DATA)  lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx)
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)
        for f in $(ALL_HEADERS); do \
-       if test ! -d $(includedir)/`dirname $$f` ; then \
-       $(INSTALL_DIR) $(includedir)/`dirname $$f`; \
+       if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
        fi; \
-       $(INSTALL_DATA) $(srcdir)/include//$$f $(includedir)/$$f; \
+       $(INSTALL_DATA) $(srcdir)/include//$$f $(DESTDIR)$(includedir)/$$f; \
        done
        @echo " "
        @echo " ------------------------------------------------------"
@@ -11424,165 +11524,165 @@ install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__in
        @echo " "
 
 @COND_USE_GUI_1@install-afm: 
-@COND_USE_GUI_1@       $(INSTALL_DIR) $(datadir)/wx/2.5/afm
-@COND_USE_GUI_1@       (cd $(srcdir) ; $(INSTALL_DATA)  misc/afm/*.afm $(datadir)/wx/2.5/afm)
+@COND_USE_GUI_1@       $(INSTALL_DIR) $(DESTDIR)$(datadir)/wx/2.5/afm
+@COND_USE_GUI_1@       (cd $(srcdir) ; $(INSTALL_DATA)  misc/afm/*.afm $(DESTDIR)$(datadir)/wx/2.5/afm)
 
 @COND_USE_GUI_1@install-gsafm: 
-@COND_USE_GUI_1@       $(INSTALL_DIR) $(datadir)/wx/2.5/gs_afm
-@COND_USE_GUI_1@       (cd $(srcdir) ; $(INSTALL_DATA)  misc/gs_afm/*.afm $(datadir)/wx/2.5/gs_afm)
+@COND_USE_GUI_1@       $(INSTALL_DIR) $(DESTDIR)$(datadir)/wx/2.5/gs_afm
+@COND_USE_GUI_1@       (cd $(srcdir) ; $(INSTALL_DATA)  misc/gs_afm/*.afm $(DESTDIR)$(datadir)/wx/2.5/gs_afm)
 
 install-strip: install
-       $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-       $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-       $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-       $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-       $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-       $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-       $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-       $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-       $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-       $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 
 install-wxconfig: 
-       $(INSTALL_DIR) $(bindir)
-       $(INSTALL_PROGRAM) wx$(TOOLCHAIN_NAME)-config $(bindir)
-       (cd $(bindir) && rm -f wx-config && $(LN_S) wx$(TOOLCHAIN_NAME)-config wx-config)
+       $(INSTALL_DIR) $(DESTDIR)$(bindir)
+       $(INSTALL_PROGRAM) wx$(TOOLCHAIN_NAME)-config $(DESTDIR)$(bindir)
+       (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) wx$(TOOLCHAIN_NAME)-config wx-config)
 
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_advdll: 
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(libdir) ; $(__advdll___so_symlinks_inst_cmd))
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__advdll___so_symlinks_inst_cmd))
 
 @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@install_advlib: 
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX).a $(libdir)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_MONOLITHIC_0_SHARED_1@install_basedll: 
-@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1@   (cd $(libdir) ; $(__basedll___so_symlinks_inst_cmd))
+@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__basedll___so_symlinks_inst_cmd))
 
 @COND_MONOLITHIC_0_SHARED_0@install_baselib: 
-@COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a $(libdir)
+@COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@install_coredll: 
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(libdir) ; $(__coredll___so_symlinks_inst_cmd))
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ (cd $(DESTDIR)$(libdir) ; $(__coredll___so_symlinks_inst_cmd))
 
 @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@install_corelib: 
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX).a $(libdir)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@install_dbgriddll: 
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      (cd $(libdir) ; $(__dbgriddll___so_symlinks_inst_cmd))
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@      (cd $(DESTDIR)$(libdir) ; $(__dbgriddll___so_symlinks_inst_cmd))
 
 @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@install_dbgridlib: 
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX).a $(libdir)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@      $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@install_gldll: 
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DIR) $(libdir)
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir)
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir)
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ (cd $(libdir) ; $(__gldll___so_symlinks_inst_cmd))
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir)
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ (cd $(DESTDIR)$(libdir) ; $(__gldll___so_symlinks_inst_cmd))
 
 @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@install_gllib: 
-@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DIR) $(libdir)
-@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a $(libdir)
+@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@install_htmldll: 
-@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        (cd $(libdir) ; $(__htmldll___so_symlinks_inst_cmd))
+@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        (cd $(DESTDIR)$(libdir) ; $(__htmldll___so_symlinks_inst_cmd))
 
 @COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@install_htmllib: 
-@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@        $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX).a $(libdir)
+@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_MONOLITHIC_1_SHARED_1@install_monodll: 
-@COND_MONOLITHIC_1_SHARED_1@   $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_1_SHARED_1@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir)
-@COND_MONOLITHIC_1_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir)
-@COND_MONOLITHIC_1_SHARED_1@   (cd $(libdir) ; $(__monodll___so_symlinks_inst_cmd))
+@COND_MONOLITHIC_1_SHARED_1@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_1_SHARED_1@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_1_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_1_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__monodll___so_symlinks_inst_cmd))
 
 @COND_MONOLITHIC_1_SHARED_0@install_monolib: 
-@COND_MONOLITHIC_1_SHARED_0@   $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_1_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a $(libdir)
+@COND_MONOLITHIC_1_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_1_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_MONOLITHIC_0_SHARED_1@install_netdll: 
-@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1@   (cd $(libdir) ; $(__netdll___so_symlinks_inst_cmd))
+@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__netdll___so_symlinks_inst_cmd))
 
 @COND_MONOLITHIC_0_SHARED_0@install_netlib: 
-@COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX).a $(libdir)
+@COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@install_odbcdll: 
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        (cd $(libdir) ; $(__odbcdll___so_symlinks_inst_cmd))
+@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@        (cd $(DESTDIR)$(libdir) ; $(__odbcdll___so_symlinks_inst_cmd))
 
 @COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@install_odbclib: 
-@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a $(libdir)
+@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_SHARED_0_WXUSE_EXPAT_BUILTIN@install_wxexpat: 
-@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@    $(INSTALL_DIR) $(libdir)
-@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@    $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir)
+@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@    $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@    $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@install_wxjpeg: 
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@        $(INSTALL_DIR) $(libdir)
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir)
+@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_SHARED_0_WXUSE_ODBC_BUILTIN@install_wxodbc: 
-@COND_SHARED_0_WXUSE_ODBC_BUILTIN@     $(INSTALL_DIR) $(libdir)
-@COND_SHARED_0_WXUSE_ODBC_BUILTIN@     $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir)
+@COND_SHARED_0_WXUSE_ODBC_BUILTIN@     $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0_WXUSE_ODBC_BUILTIN@     $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@install_wxpng: 
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ $(INSTALL_DIR) $(libdir)
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxpng$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir)
+@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxpng$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_SHARED_0_WXUSE_REGEX_BUILTIN@install_wxregex: 
-@COND_SHARED_0_WXUSE_REGEX_BUILTIN@    $(INSTALL_DIR) $(libdir)
-@COND_SHARED_0_WXUSE_REGEX_BUILTIN@    $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir)
+@COND_SHARED_0_WXUSE_REGEX_BUILTIN@    $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0_WXUSE_REGEX_BUILTIN@    $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@install_wxtiff: 
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@        $(INSTALL_DIR) $(libdir)
-@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir)
+@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_SHARED_0_WXUSE_ZLIB_BUILTIN@install_wxzlib: 
-@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@     $(INSTALL_DIR) $(libdir)
-@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@     $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir)
+@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@     $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@     $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_MONOLITHIC_0_SHARED_1@install_xmldll: 
-@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir)
-@COND_MONOLITHIC_0_SHARED_1@   (cd $(libdir) ; $(__xmldll___so_symlinks_inst_cmd))
+@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_1@   (cd $(DESTDIR)$(libdir) ; $(__xmldll___so_symlinks_inst_cmd))
 
 @COND_MONOLITHIC_0_SHARED_0@install_xmllib: 
-@COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DIR) $(libdir)
-@COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX).a $(libdir)
+@COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 locale_install: 
-       $(INSTALL_DIR) $(datadir)/locale
+       $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
        for l in $(LOCALE_LINGUAS) ; do \
-       $(INSTALL_DIR) $(datadir)/locale/$$l ; \
-       $(INSTALL_DIR) $(datadir)/locale/$$l/LC_MESSAGES ; \
+       $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
+       $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
        if test -f $(srcdir)/locale/$$l.mo ; then \
-       $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
+       $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
        fi ; \
        done
 
@@ -11595,7 +11695,7 @@ locale_install:
 @COND_TOOLKIT_MAC@     $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).1.rsrc $(libdir)
 
 @COND_MONOLITHIC_1_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__monodll_PCH_DEP)  $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname)
-@COND_MONOLITHIC_1_SHARED_1@   $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(EXTRALIBS_XML) $(EXTRALIBS_ODBC)
+@COND_MONOLITHIC_1_SHARED_1@   $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_ODBC)
 @COND_MONOLITHIC_1_SHARED_1@   
 @COND_MONOLITHIC_1_SHARED_1@   $(__monodll___so_symlinks_cmd)
 
@@ -11884,6 +11984,12 @@ monodll_calctrl.o: $(srcdir)/src/generic/calctrl.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_checklst.o: $(srcdir)/src/cocoa/checklst.mm
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+@COND_PLATFORM_UNIX_1_USE_GUI_1@monodll_chm.o: $(srcdir)/src/html/chm.cpp
+@COND_PLATFORM_UNIX_1_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@monodll_chm.o: $(srcdir)/src/html/chm.cpp
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@     $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 @COND_USE_GUI_1@monodll_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -12355,6 +12461,15 @@ monodll_dirmac.o: $(srcdir)/src/mac/dirmac.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@monodll_display.o: $(srcdir)/src/msw/display.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_GTK_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp
+@COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_X11_USE_GUI_1@monodll_displayx11.o: $(srcdir)/src/unix/displayx11.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 @COND_USE_GUI_1@monodll_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -12421,6 +12536,15 @@ monodll_event.o: $(srcdir)/src/common/event.cpp
 @COND_TOOLKIT_GTK_USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp
 @COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_evtloop.o: $(srcdir)/src/os2/evtloop.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_MGL_USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_evtloop.o: $(srcdir)/src/motif/evtloop.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -12430,9 +12554,6 @@ monodll_event.o: $(srcdir)/src/common/event.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/msw/evtloop.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_MGL_USE_GUI_1@monodll_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
 monodll_extended.o: $(srcdir)/src/common/extended.c
        $(CCC) -c -o $@ $(MONODLL_CFLAGS) $<
 
@@ -12751,6 +12872,9 @@ monodll_gsockpm.o: $(srcdir)/src/os2/gsockpm.c
 monodll_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+monodll_gzstream.o: $(srcdir)/src/common/gzstream.cpp
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 monodll_hash.o: $(srcdir)/src/common/hash.cpp
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -12967,9 +13091,6 @@ monodll_list.o: $(srcdir)/src/common/list.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_listbox.o: $(srcdir)/src/mac/listbox.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/os2/listctrl.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/msw/listctrl.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -12985,6 +13106,9 @@ monodll_list.o: $(srcdir)/src/common/list.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@monodll_listctrl.o: $(srcdir)/src/generic/listctrl.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -13153,8 +13277,8 @@ monodll_mimetmac.o: $(srcdir)/src/mac/mimetmac.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_minifram.o: $(srcdir)/src/motif/minifram.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monodll_minifram.o: $(srcdir)/src/gtk/minifram.cpp
-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_TOOLKIT_GTK_USE_GUI_1@monodll_minifram.o: $(srcdir)/src/gtk/minifram.cpp
+@COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_MSW_USE_GUI_1@monodll_minifram.o: $(srcdir)/src/msw/minifram.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -13321,6 +13445,9 @@ monodll_pnghand.o: $(srcdir)/src/mac/pnghand.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@monodll_popupwin.o: $(srcdir)/src/msw/popupwin.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_popupwin.o: $(srcdir)/src/motif/popupwin.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 monodll_print.o: $(srcdir)/src/os2/print.cpp
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -13348,6 +13475,9 @@ monodll_printmac.o: $(srcdir)/src/mac/printmac.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -13966,11 +14096,8 @@ monodll_topluniv.o: $(srcdir)/src/univ/topluniv.cpp
 @COND_USE_GUI_1@monodll_treectlg.o: $(srcdir)/src/generic/treectlg.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_treectrl.o: $(srcdir)/src/os2/treectrl.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+monodll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 monodll_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -14460,6 +14587,12 @@ monolib_calctrl.o: $(srcdir)/src/generic/calctrl.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_checklst.o: $(srcdir)/src/cocoa/checklst.mm
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+@COND_PLATFORM_UNIX_1_USE_GUI_1@monolib_chm.o: $(srcdir)/src/html/chm.cpp
+@COND_PLATFORM_UNIX_1_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@monolib_chm.o: $(srcdir)/src/html/chm.cpp
+@COND_PLATFORM_MACOSX_1_USE_GUI_1@     $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 @COND_USE_GUI_1@monolib_choiccmn.o: $(srcdir)/src/common/choiccmn.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -14931,6 +15064,15 @@ monolib_dirmac.o: $(srcdir)/src/mac/dirmac.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@monolib_display.o: $(srcdir)/src/msw/display.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_GTK_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp
+@COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_X11_USE_GUI_1@monolib_displayx11.o: $(srcdir)/src/unix/displayx11.cpp
+@COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 @COND_USE_GUI_1@monolib_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -14997,6 +15139,15 @@ monolib_event.o: $(srcdir)/src/common/event.cpp
 @COND_TOOLKIT_GTK_USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/gtk/evtloop.cpp
 @COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_evtloop.o: $(srcdir)/src/cocoa/evtloop.mm
+@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_evtloop.o: $(srcdir)/src/os2/evtloop.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_MGL_USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp
+@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_evtloop.o: $(srcdir)/src/motif/evtloop.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -15006,9 +15157,6 @@ monolib_event.o: $(srcdir)/src/common/event.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/msw/evtloop.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_MGL_USE_GUI_1@monolib_evtloop.o: $(srcdir)/src/mgl/evtloop.cpp
-@COND_TOOLKIT_MGL_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
 monolib_extended.o: $(srcdir)/src/common/extended.c
        $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $<
 
@@ -15327,6 +15475,9 @@ monolib_gsockpm.o: $(srcdir)/src/os2/gsockpm.c
 monolib_gtk.o: $(srcdir)/src/univ/themes/gtk.cpp
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+monolib_gzstream.o: $(srcdir)/src/common/gzstream.cpp
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 monolib_hash.o: $(srcdir)/src/common/hash.cpp
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -15543,9 +15694,6 @@ monolib_list.o: $(srcdir)/src/common/list.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_listbox.o: $(srcdir)/src/mac/listbox.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/os2/listctrl.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/msw/listctrl.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -15561,6 +15709,9 @@ monolib_list.o: $(srcdir)/src/common/list.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp
+@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 @COND_USE_GUI_1_WXUNIV_1@monolib_listctrl.o: $(srcdir)/src/generic/listctrl.cpp
 @COND_USE_GUI_1_WXUNIV_1@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -15729,8 +15880,8 @@ monolib_mimetmac.o: $(srcdir)/src/mac/mimetmac.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_minifram.o: $(srcdir)/src/motif/minifram.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@monolib_minifram.o: $(srcdir)/src/gtk/minifram.cpp
-@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_TOOLKIT_GTK_USE_GUI_1@monolib_minifram.o: $(srcdir)/src/gtk/minifram.cpp
+@COND_TOOLKIT_GTK_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_MSW_USE_GUI_1@monolib_minifram.o: $(srcdir)/src/msw/minifram.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@@ -15897,6 +16048,9 @@ monolib_pnghand.o: $(srcdir)/src/mac/pnghand.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@monolib_popupwin.o: $(srcdir)/src/msw/popupwin.cpp
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_popupwin.o: $(srcdir)/src/motif/popupwin.cpp
+@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 monolib_print.o: $(srcdir)/src/os2/print.cpp
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -15924,6 +16078,9 @@ monolib_printmac.o: $(srcdir)/src/mac/printmac.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_prntdlgg.o: $(srcdir)/src/generic/prntdlgg.cpp
 @COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -16542,11 +16699,8 @@ monolib_topluniv.o: $(srcdir)/src/univ/topluniv.cpp
 @COND_USE_GUI_1@monolib_treectlg.o: $(srcdir)/src/generic/treectlg.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_treectrl.o: $(srcdir)/src/os2/treectrl.cpp
-@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+monolib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 monolib_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@@ -17254,6 +17408,9 @@ wxtiff_tif_tile.o: $(srcdir)/src/tiff/tif_tile.c
 @COND_PLATFORM_MACOSX_1@wxtiff_tif_unix.o: $(srcdir)/src/tiff/tif_unix.c
 @COND_PLATFORM_MACOSX_1@       $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $<
 
+@COND_PLATFORM_OS2_1@wxtiff_tif_unix.o: $(srcdir)/src/tiff/tif_unix.c
+@COND_PLATFORM_OS2_1@  $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $<
+
 wxtiff_tif_version.o: $(srcdir)/src/tiff/tif_version.c
        $(CCC) -c -o $@ $(WXTIFF_CFLAGS) $<