X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c4836bee8b3f8c5cf4586263c3cfced487c4b87e..5d2e69e8c0248f7ab18182e2fda4727ecd620712:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 415b782e30..6979d19e97 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -23,7 +23,6 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 EXTRALIBS_ODBC = @EXTRALIBS_ODBC@
 EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
 EXTRALIBS_XML = @EXTRALIBS_XML@
-GCC_PCH = @GCC_PCH@
 HOST_SUFFIX = @HOST_SUFFIX@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_DIR = @INSTALL_DIR@
@@ -52,7 +51,7 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
-ADVDLL_CXXFLAGS = -I.pch/wxprec_advdll $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+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) \
@@ -70,7 +69,7 @@ ADVDLL_OBJECTS =  \
 	advdll_tipdlg.o \
 	advdll_wizard.o \
 	$(__ADVANCED_PLATFORM_SRC_OBJECTS_2)
-ADVLIB_CXXFLAGS = -I.pch/wxprec_advlib $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+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)
@@ -233,12 +232,12 @@ ALL_HEADERS =  \
 	wx/dbkeyg.h \
 	wx/dbtable.h \
 	wx/dbgrid.h
-BASEDLL_CFLAGS = -I.pch/wxprec_basedll $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+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 = -I.pch/wxprec_basedll $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+BASEDLL_CXXFLAGS = $(__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 \
@@ -299,12 +298,13 @@ BASEDLL_OBJECTS =  \
 	basedll_fs_mem.o \
 	basedll_msgout.o \
 	basedll_utilscmn.o \
-	$(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2)
-BASELIB_CFLAGS = -I.pch/wxprec_baselib $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+	$(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2) \
+	$(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_2)
+BASELIB_CFLAGS = $(__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 $(CFLAGS)
-BASELIB_CXXFLAGS = -I.pch/wxprec_baselib $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+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)
@@ -364,13 +364,14 @@ BASELIB_OBJECTS =  \
 	baselib_fs_mem.o \
 	baselib_msgout.o \
 	baselib_utilscmn.o \
-	$(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3)
-COREDLL_CFLAGS = -I.pch/wxprec_coredll $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+	$(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3) \
+	$(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3)
+COREDLL_CFLAGS = $(__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 $(CFLAGS) $(PIC_FLAG)
-COREDLL_CXXFLAGS = -I.pch/wxprec_coredll $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+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 \
@@ -381,12 +382,13 @@ COREDLL_OBJECTS =  \
 	coredll_msgout.o \
 	coredll_utilscmn.o \
 	$(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4) \
+	$(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4) \
 	$(__CORE_SRC_OBJECTS_2)
-CORELIB_CFLAGS = -I.pch/wxprec_corelib $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+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 = -I.pch/wxprec_corelib $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+CORELIB_CXXFLAGS = $(__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 $(CXXFLAGS)
@@ -396,34 +398,35 @@ CORELIB_OBJECTS =  \
 	corelib_msgout.o \
 	corelib_utilscmn.o \
 	$(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5) \
+	$(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5) \
 	$(__CORE_SRC_OBJECTS_3)
-DBGRIDDLL_CXXFLAGS = -I.pch/wxprec_dbgriddll $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+DBGRIDDLL_CXXFLAGS = $(__dbgriddll_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_DBGRID \
 	$(CXXFLAGS) $(PIC_FLAG)
 DBGRIDDLL_OBJECTS =  \
 	dbgriddll_dbgrid.o
-DBGRIDLIB_CXXFLAGS = -I.pch/wxprec_dbgridlib $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+DBGRIDLIB_CXXFLAGS = $(__dbgridlib_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)
 DBGRIDLIB_OBJECTS =  \
 	dbgridlib_dbgrid.o
-GLDLL_CXXFLAGS = -I.pch/wxprec_gldll $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+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)
 GLDLL_OBJECTS =  \
 	$(__OPENGL_SRC_OBJECTS)
-GLLIB_CXXFLAGS = -I.pch/wxprec_gllib $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+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_OBJECTS =  \
 	$(__OPENGL_SRC_OBJECTS_1)
-HTMLDLL_CXXFLAGS = -I.pch/wxprec_htmldll $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+HTMLDLL_CXXFLAGS = $(__htmldll_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_HTML \
@@ -451,7 +454,7 @@ HTMLDLL_OBJECTS =  \
 	htmldll_m_tables.o \
 	htmldll_winpars.o \
 	htmldll_htmllbox.o
-HTMLLIB_CXXFLAGS = -I.pch/wxprec_htmllib $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+HTMLLIB_CXXFLAGS = $(__htmllib_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)
@@ -479,12 +482,12 @@ HTMLLIB_OBJECTS =  \
 	htmllib_winpars.o \
 	htmllib_htmllbox.o
 LIBDIRNAME = $(top_builddir)lib
-MONODLL_CFLAGS = -I.pch/wxprec_monodll $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+MONODLL_CFLAGS = $(__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 $(CFLAGS) \
 	$(PIC_FLAG)
-MONODLL_CXXFLAGS = -I.pch/wxprec_monodll $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+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) \
@@ -546,6 +549,7 @@ MONODLL_OBJECTS =  \
 	monodll_msgout.o \
 	monodll_utilscmn.o \
 	$(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS) \
+	$(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS) \
 	monodll_fs_inet.o \
 	monodll_ftp.o \
 	monodll_http.o \
@@ -559,11 +563,11 @@ MONODLL_OBJECTS =  \
 	$(__NET_PLATFORM_SRC_OBJECTS) \
 	$(__MONOLIB_GUI_SRC_OBJECTS) \
 	monodll_xml.o
-MONOLIB_CFLAGS = -I.pch/wxprec_monolib $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+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 = -I.pch/wxprec_monolib $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+MONOLIB_CXXFLAGS = $(__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 $(CXXFLAGS)
@@ -624,6 +628,7 @@ MONOLIB_OBJECTS =  \
 	monolib_msgout.o \
 	monolib_utilscmn.o \
 	$(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1) \
+	$(__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_1) \
 	monolib_fs_inet.o \
 	monolib_ftp.o \
 	monolib_http.o \
@@ -637,12 +642,12 @@ MONOLIB_OBJECTS =  \
 	$(__NET_PLATFORM_SRC_OBJECTS_1) \
 	$(__MONOLIB_GUI_SRC_OBJECTS_1) \
 	monolib_xml.o
-NETDLL_CFLAGS = -I.pch/wxprec_netdll $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+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 = -I.pch/wxprec_netdll $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+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 \
@@ -659,16 +664,14 @@ NETDLL_OBJECTS =  \
 	netdll_socket.o \
 	netdll_url.o \
 	$(__NET_PLATFORM_SRC_OBJECTS_2)
-NETLIB_CFLAGS = -I.pch/wxprec_netlib $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+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 -DWXUSINGDLL \
-	-DWXMAKINGDLL_NET $(CFLAGS)
-NETLIB_CXXFLAGS = -I.pch/wxprec_netlib $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+	$(__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 -DWXUSINGDLL \
-	-DWXMAKINGDLL_NET $(CXXFLAGS)
+	$(__INC_REGEX_p) $(__INC_EXPAT_p) -DwxUSE_GUI=0 $(CXXFLAGS)
 NETLIB_OBJECTS =  \
 	netlib_fs_inet.o \
 	netlib_ftp.o \
@@ -681,7 +684,7 @@ NETLIB_OBJECTS =  \
 	netlib_socket.o \
 	netlib_url.o \
 	$(__NET_PLATFORM_SRC_OBJECTS_3)
-ODBCDLL_CXXFLAGS = -I.pch/wxprec_odbcdll $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+ODBCDLL_CXXFLAGS = $(__odbcdll_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 \
@@ -689,7 +692,7 @@ ODBCDLL_CXXFLAGS = -I.pch/wxprec_odbcdll $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
 ODBCDLL_OBJECTS =  \
 	odbcdll_db.o \
 	odbcdll_dbtable.o
-ODBCLIB_CXXFLAGS = -I.pch/wxprec_odbclib $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+ODBCLIB_CXXFLAGS = $(__odbclib_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)
@@ -842,14 +845,14 @@ WXZLIB_OBJECTS =  \
 	wxzlib_infcodes.o \
 	wxzlib_infutil.o \
 	wxzlib_inffast.o
-XMLDLL_CXXFLAGS = -I.pch/wxprec_xmldll $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+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_OBJECTS =  \
 	xmldll_xml.o
-XMLLIB_CXXFLAGS = -I.pch/wxprec_xmllib $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
+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)
@@ -1974,6 +1977,12 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
 @COND_PLATFORM_UNIX_1@	= corelib_utilsunx.o
 @COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 \
 @COND_PLATFORM_WIN32_1@	= corelib_main.o corelib_mslu.o corelib_volume.o
+@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS = monodll_utils.o
+@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_1 = monolib_utils.o
+@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_2 = basedll_utils.o
+@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_3 = baselib_utils.o
+@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4 = coredll_utils.o
+@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5 = corelib_utils.o
 COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS =  \
 	monodll_baseunix.o \
 	monodll_dir.o \
@@ -1988,13 +1997,9 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS =  \
 	monodll_snglinst.o \
 	monodll_threadpsx.o
 @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS)
-COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS =  \
-	monodll_dirmac.o \
-	monodll_mimetmac.o \
-	monodll_utils.o \
-	monodll_utilsexc.o \
-	monodll_baseunix.o
-@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS)
+@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS = \
+@COND_TOOLKIT_MAC@	monodll_dirmac.o monodll_mimetmac.o monodll_baseunix.o \
+@COND_TOOLKIT_MAC@	monodll_utilsexc.o
 COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_1 =  \
 	monolib_baseunix.o \
 	monolib_dir.o \
@@ -2009,13 +2014,9 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_1 =  \
 	monolib_snglinst.o \
 	monolib_threadpsx.o
 @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_1)
-COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1 =  \
-	monolib_dirmac.o \
-	monolib_mimetmac.o \
-	monolib_utils.o \
-	monolib_utilsexc.o \
-	monolib_baseunix.o
-@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1)
+@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_1 = \
+@COND_TOOLKIT_MAC@	monolib_dirmac.o monolib_mimetmac.o monolib_baseunix.o \
+@COND_TOOLKIT_MAC@	monolib_utilsexc.o
 COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_2 =  \
 	basedll_baseunix.o \
 	basedll_dir.o \
@@ -2030,13 +2031,9 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_2 =  \
 	basedll_snglinst.o \
 	basedll_threadpsx.o
 @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_2)
-COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2 =  \
-	basedll_dirmac.o \
-	basedll_mimetmac.o \
-	basedll_utils.o \
-	basedll_utilsexc.o \
-	basedll_baseunix.o
-@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2)
+@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_2 = \
+@COND_TOOLKIT_MAC@	basedll_dirmac.o basedll_mimetmac.o basedll_baseunix.o \
+@COND_TOOLKIT_MAC@	basedll_utilsexc.o
 COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_3 =  \
 	baselib_baseunix.o \
 	baselib_dir.o \
@@ -2051,13 +2048,9 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_3 =  \
 	baselib_snglinst.o \
 	baselib_threadpsx.o
 @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_3)
-COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3 =  \
-	baselib_dirmac.o \
-	baselib_mimetmac.o \
-	baselib_utils.o \
-	baselib_utilsexc.o \
-	baselib_baseunix.o
-@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3)
+@COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_3 = \
+@COND_TOOLKIT_MAC@	baselib_dirmac.o baselib_mimetmac.o baselib_baseunix.o \
+@COND_TOOLKIT_MAC@	baselib_utilsexc.o
 @COND_PLATFORM_MACOSX_1@__BASE_PLATFORM_SRC_OBJECTS \
 @COND_PLATFORM_MACOSX_1@	= $(__BASE_MACOSX_SRC_OBJECTS)
 COND_PLATFORM_UNIX_1___BASE_PLATFORM_SRC_OBJECTS =  \
@@ -2385,7 +2378,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
 	monodll_vscroll.o
 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS)
 COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
-	$(__LOWLEVEL_SRC_OBJECTS_8) \
+	$(__LOWLEVEL_SRC_OBJECTS_0) \
 	$(__GUI_SRC_OBJECTS_1) \
 	monolib_accesscmn.o \
 	monolib_appcmn.o \
@@ -2480,7 +2473,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
 	monolib_vscroll.o
 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_1 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1)
 COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
-	$(__LOWLEVEL_SRC_OBJECTS_8) \
+	$(__LOWLEVEL_SRC_OBJECTS_0) \
 	monolib_accel.o \
 	monolib_colrdlgg.o \
 	monolib_dirdlgg.o \
@@ -2623,7 +2616,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
 	monolib_vscroll.o
 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_1 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1)
 COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
-	$(__LOWLEVEL_SRC_OBJECTS_0) \
+	$(__LOWLEVEL_SRC_OBJECTS_8) \
 	$(__GUI_SRC_OBJECTS_2) \
 	coredll_accesscmn.o \
 	coredll_appcmn.o \
@@ -2718,7 +2711,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
 	coredll_vscroll.o
 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_2 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2)
 COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
-	$(__LOWLEVEL_SRC_OBJECTS_0) \
+	$(__LOWLEVEL_SRC_OBJECTS_8) \
 	coredll_accel.o \
 	coredll_colrdlgg.o \
 	coredll_dirdlgg.o \
@@ -4856,178 +4849,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS =  \
 @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS)
 @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_0 = 
 COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_0 =  \
-	coredll_caret.o \
-	coredll_printps.o \
-	coredll_dialup.o \
-	coredll_fontenum.o \
-	coredll_fontutil.o \
-	coredll_utilsx11.o \
-	coredll_paletteg.o \
-	coredll_app.o \
-	coredll_bitmap.o \
-	coredll_brush.o \
-	coredll_clipbrd.o \
-	coredll_colour.o \
-	coredll_cursor.o \
-	coredll_data.o \
-	coredll_dataobj.o \
-	coredll_dc.o \
-	coredll_dcclient.o \
-	coredll_dcmemory.o \
-	coredll_dcscreen.o \
-	coredll_dnd.o \
-	coredll_evtloop.o \
-	coredll_font.o \
-	coredll_gdiobj.o \
-	coredll_gsockgtk.o \
-	coredll_icon.o \
-	coredll_main.o \
-	coredll_pen.o \
-	coredll_popupwin.o \
-	coredll_region.o \
-	coredll_renderer.o \
-	coredll_settings.o \
-	coredll_timer.o \
-	coredll_tooltip.o \
-	coredll_toplevel.o \
-	coredll_utilsgtk.o \
-	coredll_win_gtk.o \
-	coredll_window.o
-@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_0)
-@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_0 = 
-COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_0 =  \
-	coredll_caret.o \
-	coredll_timer.o \
-	coredll_app.o \
-	coredll_bitmap.o \
-	coredll_brush.o \
-	coredll_clipbrd.o \
-	coredll_colour.o \
-	coredll_cursor.o \
-	coredll_data.o \
-	coredll_dc.o \
-	coredll_dcclient.o \
-	coredll_dcmemory.o \
-	coredll_dcscreen.o \
-	coredll_dirmgl.o \
-	coredll_evtloop.o \
-	coredll_font.o \
-	coredll_fontenum.o \
-	coredll_fontutil.o \
-	coredll_gdiobj.o \
-	coredll_icon.o \
-	coredll_palette.o \
-	coredll_pen.o \
-	coredll_region.o \
-	coredll_settings.o \
-	coredll_toplevel.o \
-	coredll_utils.o \
-	coredll_window.o
-@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_0)
-COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_0 =  \
-	coredll_caret.o \
-	coredll_printps.o \
-	coredll_dialup.o \
-	coredll_fontenum.o \
-	coredll_fontutil.o \
-	coredll_utilsx11.o \
-	coredll_bitmap.o \
-	coredll_brush.o \
-	coredll_pen.o \
-	coredll_region.o \
-	coredll_utilsx.o
-@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_0)
-COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0 =  \
-	coredll_app.o \
-	coredll_bitmap.o \
-	coredll_brush.o \
-	coredll_caret.o \
-	coredll_clipbrd.o \
-	coredll_colour.o \
-	coredll_cursor.o \
-	coredll_data.o \
-	coredll_dc.o \
-	coredll_dcclient.o \
-	coredll_dcmemory.o \
-	coredll_dcprint.o \
-	coredll_dcscreen.o \
-	coredll_dialup.o \
-	coredll_dib.o \
-	coredll_dirdlg.o \
-	coredll_display.o \
-	coredll_enhmeta.o \
-	coredll_evtloop.o \
-	coredll_font.o \
-	coredll_fontenum.o \
-	coredll_fontutil.o \
-	coredll_gdiimage.o \
-	coredll_gdiobj.o \
-	coredll_gsockmsw.o \
-	coredll_helpchm.o \
-	coredll_helpwin.o \
-	coredll_icon.o \
-	coredll_minifram.o \
-	coredll_automtn.o \
-	coredll_dataobj.o \
-	coredll_dropsrc.o \
-	coredll_droptgt.o \
-	coredll_oleutils.o \
-	coredll_uuid.o \
-	coredll_palette.o \
-	coredll_pen.o \
-	coredll_popupwin.o \
-	coredll_region.o \
-	coredll_renderer.o \
-	coredll_settings.o \
-	coredll_timer.o \
-	coredll_tooltip.o \
-	coredll_toplevel.o \
-	coredll_utilsgui.o \
-	coredll_uxtheme.o \
-	coredll_window.o
-@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0)
-@COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS_0 = 
-COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0 =  \
-	coredll_caret.o \
-	coredll_printps.o \
-	coredll_dialup.o \
-	coredll_fontenum.o \
-	coredll_fontutil.o \
-	coredll_utilsx11.o \
-	coredll_timer.o \
-	coredll_app.o \
-	coredll_bitmap.o \
-	coredll_brush.o \
-	coredll_clipbrd.o \
-	coredll_colour.o \
-	coredll_cursor.o \
-	coredll_data.o \
-	coredll_dataobj.o \
-	coredll_dc.o \
-	coredll_dcclient.o \
-	coredll_dcmemory.o \
-	coredll_dcscreen.o \
-	coredll_evtloop.o \
-	coredll_font.o \
-	coredll_gdiobj.o \
-	coredll_gsockx11.o \
-	coredll_icon.o \
-	coredll_main.o \
-	coredll_minifram.o \
-	coredll_nanox.o \
-	coredll_palette.o \
-	coredll_pen.o \
-	coredll_popupwin.o \
-	coredll_region.o \
-	coredll_reparent.o \
-	coredll_settings.o \
-	coredll_toplevel.o \
-	coredll_utils.o \
-	coredll_utilsx.o \
-	coredll_window.o
-@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0)
-@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_8 = 
-COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8 =  \
 	monolib_caret.o \
 	monolib_printps.o \
 	monolib_dialup.o \
@@ -5065,9 +4886,9 @@ COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8 =  \
 	monolib_utilsgtk.o \
 	monolib_win_gtk.o \
 	monolib_window.o
-@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8)
-@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_8 = 
-COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_8 =  \
+@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_0)
+@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_0 = 
+COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_0 =  \
 	monolib_caret.o \
 	monolib_timer.o \
 	monolib_app.o \
@@ -5095,8 +4916,8 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_8 =  \
 	monolib_toplevel.o \
 	monolib_utils.o \
 	monolib_window.o
-@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_8)
-COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_8 =  \
+@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_0)
+COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_0 =  \
 	monolib_caret.o \
 	monolib_printps.o \
 	monolib_dialup.o \
@@ -5108,8 +4929,8 @@ COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_8 =  \
 	monolib_pen.o \
 	monolib_region.o \
 	monolib_utilsx.o
-@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_8)
-COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8 =  \
+@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_0)
+COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0 =  \
 	monolib_app.o \
 	monolib_bitmap.o \
 	monolib_brush.o \
@@ -5157,9 +4978,9 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8 =  \
 	monolib_utilsgui.o \
 	monolib_uxtheme.o \
 	monolib_window.o
-@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8)
-@COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS_8 = 
-COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8 =  \
+@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0)
+@COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS_0 = 
+COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0 =  \
 	monolib_caret.o \
 	monolib_printps.o \
 	monolib_dialup.o \
@@ -5197,6 +5018,178 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8 =  \
 	monolib_utils.o \
 	monolib_utilsx.o \
 	monolib_window.o
+@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0)
+@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_8 = 
+COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8 =  \
+	coredll_caret.o \
+	coredll_printps.o \
+	coredll_dialup.o \
+	coredll_fontenum.o \
+	coredll_fontutil.o \
+	coredll_utilsx11.o \
+	coredll_paletteg.o \
+	coredll_app.o \
+	coredll_bitmap.o \
+	coredll_brush.o \
+	coredll_clipbrd.o \
+	coredll_colour.o \
+	coredll_cursor.o \
+	coredll_data.o \
+	coredll_dataobj.o \
+	coredll_dc.o \
+	coredll_dcclient.o \
+	coredll_dcmemory.o \
+	coredll_dcscreen.o \
+	coredll_dnd.o \
+	coredll_evtloop.o \
+	coredll_font.o \
+	coredll_gdiobj.o \
+	coredll_gsockgtk.o \
+	coredll_icon.o \
+	coredll_main.o \
+	coredll_pen.o \
+	coredll_popupwin.o \
+	coredll_region.o \
+	coredll_renderer.o \
+	coredll_settings.o \
+	coredll_timer.o \
+	coredll_tooltip.o \
+	coredll_toplevel.o \
+	coredll_utilsgtk.o \
+	coredll_win_gtk.o \
+	coredll_window.o
+@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8)
+@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_8 = 
+COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_8 =  \
+	coredll_caret.o \
+	coredll_timer.o \
+	coredll_app.o \
+	coredll_bitmap.o \
+	coredll_brush.o \
+	coredll_clipbrd.o \
+	coredll_colour.o \
+	coredll_cursor.o \
+	coredll_data.o \
+	coredll_dc.o \
+	coredll_dcclient.o \
+	coredll_dcmemory.o \
+	coredll_dcscreen.o \
+	coredll_dirmgl.o \
+	coredll_evtloop.o \
+	coredll_font.o \
+	coredll_fontenum.o \
+	coredll_fontutil.o \
+	coredll_gdiobj.o \
+	coredll_icon.o \
+	coredll_palette.o \
+	coredll_pen.o \
+	coredll_region.o \
+	coredll_settings.o \
+	coredll_toplevel.o \
+	coredll_utils.o \
+	coredll_window.o
+@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_8)
+COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_8 =  \
+	coredll_caret.o \
+	coredll_printps.o \
+	coredll_dialup.o \
+	coredll_fontenum.o \
+	coredll_fontutil.o \
+	coredll_utilsx11.o \
+	coredll_bitmap.o \
+	coredll_brush.o \
+	coredll_pen.o \
+	coredll_region.o \
+	coredll_utilsx.o
+@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_8)
+COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8 =  \
+	coredll_app.o \
+	coredll_bitmap.o \
+	coredll_brush.o \
+	coredll_caret.o \
+	coredll_clipbrd.o \
+	coredll_colour.o \
+	coredll_cursor.o \
+	coredll_data.o \
+	coredll_dc.o \
+	coredll_dcclient.o \
+	coredll_dcmemory.o \
+	coredll_dcprint.o \
+	coredll_dcscreen.o \
+	coredll_dialup.o \
+	coredll_dib.o \
+	coredll_dirdlg.o \
+	coredll_display.o \
+	coredll_enhmeta.o \
+	coredll_evtloop.o \
+	coredll_font.o \
+	coredll_fontenum.o \
+	coredll_fontutil.o \
+	coredll_gdiimage.o \
+	coredll_gdiobj.o \
+	coredll_gsockmsw.o \
+	coredll_helpchm.o \
+	coredll_helpwin.o \
+	coredll_icon.o \
+	coredll_minifram.o \
+	coredll_automtn.o \
+	coredll_dataobj.o \
+	coredll_dropsrc.o \
+	coredll_droptgt.o \
+	coredll_oleutils.o \
+	coredll_uuid.o \
+	coredll_palette.o \
+	coredll_pen.o \
+	coredll_popupwin.o \
+	coredll_region.o \
+	coredll_renderer.o \
+	coredll_settings.o \
+	coredll_timer.o \
+	coredll_tooltip.o \
+	coredll_toplevel.o \
+	coredll_utilsgui.o \
+	coredll_uxtheme.o \
+	coredll_window.o
+@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8)
+@COND_TOOLKIT_OS2@__LOWLEVEL_SRC_OBJECTS_8 = 
+COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8 =  \
+	coredll_caret.o \
+	coredll_printps.o \
+	coredll_dialup.o \
+	coredll_fontenum.o \
+	coredll_fontutil.o \
+	coredll_utilsx11.o \
+	coredll_timer.o \
+	coredll_app.o \
+	coredll_bitmap.o \
+	coredll_brush.o \
+	coredll_clipbrd.o \
+	coredll_colour.o \
+	coredll_cursor.o \
+	coredll_data.o \
+	coredll_dataobj.o \
+	coredll_dc.o \
+	coredll_dcclient.o \
+	coredll_dcmemory.o \
+	coredll_dcscreen.o \
+	coredll_evtloop.o \
+	coredll_font.o \
+	coredll_gdiobj.o \
+	coredll_gsockx11.o \
+	coredll_icon.o \
+	coredll_main.o \
+	coredll_minifram.o \
+	coredll_nanox.o \
+	coredll_palette.o \
+	coredll_pen.o \
+	coredll_popupwin.o \
+	coredll_region.o \
+	coredll_reparent.o \
+	coredll_settings.o \
+	coredll_toplevel.o \
+	coredll_utils.o \
+	coredll_utilsx.o \
+	coredll_window.o
 @COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8)
 @COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_9 = 
 COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9 =  \
@@ -5501,6 +5494,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 @COND_GCC_PCH_1@__advdll_PCH_DEP = .pch/wxprec_advdll/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__advdll_PCH_INC = -I.pch/wxprec_advdll
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname = \
 	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__advdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname)
@@ -5537,10 +5531,12 @@ COND_USE_SOVERSOLARIS_1___advdll___soname_flags = \
 	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_USE_SOVERSOLARIS_1@__advdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___advdll___soname_flags)
 @COND_GCC_PCH_1@__advlib_PCH_DEP = .pch/wxprec_advlib/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__advlib_PCH_INC = -I.pch/wxprec_advlib
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \
 	$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX).a
 @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__advlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname)
 @COND_GCC_PCH_1@__basedll_PCH_DEP = .pch/wxprec_basedll/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__basedll_PCH_INC = -I.pch/wxprec_basedll
 COND_MONOLITHIC_0_SHARED_1___basedll___depname = \
 	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_MONOLITHIC_0_SHARED_1@__basedll___depname = $(COND_MONOLITHIC_0_SHARED_1___basedll___depname)
@@ -5577,10 +5573,12 @@ COND_USE_SOVERSOLARIS_1___basedll___soname_flags = \
 	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_USE_SOVERSOLARIS_1@__basedll___soname_flags = $(COND_USE_SOVERSOLARIS_1___basedll___soname_flags)
 @COND_GCC_PCH_1@__baselib_PCH_DEP = .pch/wxprec_baselib/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__baselib_PCH_INC = -I.pch/wxprec_baselib
 COND_MONOLITHIC_0_SHARED_0___baselib___depname = \
 	$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a
 @COND_MONOLITHIC_0_SHARED_0@__baselib___depname = $(COND_MONOLITHIC_0_SHARED_0___baselib___depname)
 @COND_GCC_PCH_1@__coredll_PCH_DEP = .pch/wxprec_coredll/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__coredll_PCH_INC = -I.pch/wxprec_coredll
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___coredll___depname = \
 	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__coredll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___coredll___depname)
@@ -5617,10 +5615,12 @@ COND_USE_SOVERSOLARIS_1___coredll___soname_flags = \
 	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_USE_SOVERSOLARIS_1@__coredll___soname_flags = $(COND_USE_SOVERSOLARIS_1___coredll___soname_flags)
 @COND_GCC_PCH_1@__corelib_PCH_DEP = .pch/wxprec_corelib/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__corelib_PCH_INC = -I.pch/wxprec_corelib
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname = \
 	$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX).a
 @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__corelib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname)
 @COND_GCC_PCH_1@__dbgriddll_PCH_DEP = .pch/wxprec_dbgriddll/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__dbgriddll_PCH_INC = -I.pch/wxprec_dbgriddll
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___dbgriddll___depname = \
 	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__dbgriddll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___dbgriddll___depname)
@@ -5657,10 +5657,12 @@ COND_USE_SOVERSOLARIS_1___dbgriddll___soname_flags = \
 	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_USE_SOVERSOLARIS_1@__dbgriddll___soname_flags = $(COND_USE_SOVERSOLARIS_1___dbgriddll___soname_flags)
 @COND_GCC_PCH_1@__dbgridlib_PCH_DEP = .pch/wxprec_dbgridlib/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__dbgridlib_PCH_INC = -I.pch/wxprec_dbgridlib
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___dbgridlib___depname = \
 	$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX).a
 @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@__dbgridlib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___dbgridlib___depname)
 @COND_GCC_PCH_1@__gldll_PCH_DEP = .pch/wxprec_gldll/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__gldll_PCH_INC = -I.pch/wxprec_gldll
 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname = \
 	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@__gldll___depname = $(COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname)
@@ -5697,10 +5699,12 @@ COND_USE_SOVERSOLARIS_1___gldll___soname_flags = \
 	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_USE_SOVERSOLARIS_1@__gldll___soname_flags = $(COND_USE_SOVERSOLARIS_1___gldll___soname_flags)
 @COND_GCC_PCH_1@__gllib_PCH_DEP = .pch/wxprec_gllib/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__gllib_PCH_INC = -I.pch/wxprec_gllib
 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1___gllib___depname = \
 	$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a
 @COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@__gllib___depname = $(COND_SHARED_0_USE_GUI_1_USE_OPENGL_1___gllib___depname)
 @COND_GCC_PCH_1@__htmldll_PCH_DEP = .pch/wxprec_htmldll/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__htmldll_PCH_INC = -I.pch/wxprec_htmldll
 COND_MONOLITHIC_0_SHARED_1_USE_HTML_1___htmldll___depname = \
 	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@__htmldll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_HTML_1___htmldll___depname)
@@ -5737,6 +5741,7 @@ COND_USE_SOVERSOLARIS_1___htmldll___soname_flags = \
 	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_USE_SOVERSOLARIS_1@__htmldll___soname_flags = $(COND_USE_SOVERSOLARIS_1___htmldll___soname_flags)
 @COND_GCC_PCH_1@__htmllib_PCH_DEP = .pch/wxprec_htmllib/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__htmllib_PCH_INC = -I.pch/wxprec_htmllib
 COND_MONOLITHIC_0_SHARED_0_USE_HTML_1___htmllib___depname = \
 	$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX).a
 @COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@__htmllib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_HTML_1___htmllib___depname)
@@ -5772,21 +5777,26 @@ COND_MONOLITHIC_0_SHARED_0_USE_HTML_1___htmllib___depname = \
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@	= install_odbcdll
 @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@__install_odbclib___depname \
 @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@	= install_odbclib
-@COND_WXUSE_EXPAT_BUILTIN@__install_wxexpat___depname = install_wxexpat
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__install_wxjpeg___depname \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	= install_wxjpeg
-@COND_WXUSE_ODBC_BUILTIN@__install_wxodbc___depname = install_wxodbc
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__install_wxpng___depname \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	= install_wxpng
-@COND_WXUSE_REGEX_BUILTIN@__install_wxregex___depname = install_wxregex
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__install_wxtiff___depname \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	= install_wxtiff
-@COND_WXUSE_ZLIB_BUILTIN@__install_wxzlib___depname = install_wxzlib
+@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@__install_wxexpat___depname \
+@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@	= install_wxexpat
+@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__install_wxjpeg___depname \
+@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	= install_wxjpeg
+@COND_SHARED_0_WXUSE_ODBC_BUILTIN@__install_wxodbc___depname \
+@COND_SHARED_0_WXUSE_ODBC_BUILTIN@	= install_wxodbc
+@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__install_wxpng___depname \
+@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	= install_wxpng
+@COND_SHARED_0_WXUSE_REGEX_BUILTIN@__install_wxregex___depname \
+@COND_SHARED_0_WXUSE_REGEX_BUILTIN@	= install_wxregex
+@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__install_wxtiff___depname \
+@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	= install_wxtiff
+@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@__install_wxzlib___depname \
+@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@	= install_wxzlib
 @COND_MONOLITHIC_0_SHARED_1@__install_xmldll___depname = install_xmldll
 @COND_MONOLITHIC_0_SHARED_0@__install_xmllib___depname = install_xmllib
 @COND_TOOLKIT_MAC@__macos_res___depname = lib/libwx_$(TOOLCHAIN_NAME).0.r
 @COND_TOOLKIT_MAC@__macos_res_install___depname = macos-res-install
 @COND_GCC_PCH_1@__monodll_PCH_DEP = .pch/wxprec_monodll/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__monodll_PCH_INC = -I.pch/wxprec_monodll
 COND_MONOLITHIC_1_SHARED_1___monodll___depname = \
 	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_MONOLITHIC_1_SHARED_1@__monodll___depname = $(COND_MONOLITHIC_1_SHARED_1___monodll___depname)
@@ -5823,10 +5833,12 @@ COND_USE_SOVERSOLARIS_1___monodll___soname_flags = \
 	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_USE_SOVERSOLARIS_1@__monodll___soname_flags = $(COND_USE_SOVERSOLARIS_1___monodll___soname_flags)
 @COND_GCC_PCH_1@__monolib_PCH_DEP = .pch/wxprec_monolib/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__monolib_PCH_INC = -I.pch/wxprec_monolib
 COND_MONOLITHIC_1_SHARED_0___monolib___depname = \
 	$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a
 @COND_MONOLITHIC_1_SHARED_0@__monolib___depname = $(COND_MONOLITHIC_1_SHARED_0___monolib___depname)
 @COND_GCC_PCH_1@__netdll_PCH_DEP = .pch/wxprec_netdll/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__netdll_PCH_INC = -I.pch/wxprec_netdll
 COND_MONOLITHIC_0_SHARED_1___netdll___depname = \
 	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_MONOLITHIC_0_SHARED_1@__netdll___depname = $(COND_MONOLITHIC_0_SHARED_1___netdll___depname)
@@ -5863,10 +5875,12 @@ COND_USE_SOVERSOLARIS_1___netdll___soname_flags = \
 	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_USE_SOVERSOLARIS_1@__netdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___netdll___soname_flags)
 @COND_GCC_PCH_1@__netlib_PCH_DEP = .pch/wxprec_netlib/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__netlib_PCH_INC = -I.pch/wxprec_netlib
 COND_MONOLITHIC_0_SHARED_0___netlib___depname = \
 	$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX).a
 @COND_MONOLITHIC_0_SHARED_0@__netlib___depname = $(COND_MONOLITHIC_0_SHARED_0___netlib___depname)
 @COND_GCC_PCH_1@__odbcdll_PCH_DEP = .pch/wxprec_odbcdll/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__odbcdll_PCH_INC = -I.pch/wxprec_odbcdll
 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___odbcdll___depname = \
 	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@__odbcdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1___odbcdll___depname)
@@ -5903,6 +5917,7 @@ COND_USE_SOVERSOLARIS_1___odbcdll___soname_flags = \
 	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_USE_SOVERSOLARIS_1@__odbcdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___odbcdll___soname_flags)
 @COND_GCC_PCH_1@__odbclib_PCH_DEP = .pch/wxprec_odbclib/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__odbclib_PCH_INC = -I.pch/wxprec_odbclib
 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___odbclib___depname = \
 	$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a
 @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@__odbclib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___odbclib___depname)
@@ -5924,6 +5939,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___odbclib___depname = \
 @COND_WXUSE_ZLIB_BUILTIN@__wxzlib___depname = \
 @COND_WXUSE_ZLIB_BUILTIN@	$(LIBDIRNAME)/libwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX).a
 @COND_GCC_PCH_1@__xmldll_PCH_DEP = .pch/wxprec_xmldll/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__xmldll_PCH_INC = -I.pch/wxprec_xmldll
 COND_MONOLITHIC_0_SHARED_1___xmldll___depname = \
 	$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_MONOLITHIC_0_SHARED_1@__xmldll___depname = $(COND_MONOLITHIC_0_SHARED_1___xmldll___depname)
@@ -5960,6 +5976,7 @@ COND_USE_SOVERSOLARIS_1___xmldll___soname_flags = \
 	$(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 @COND_USE_SOVERSOLARIS_1@__xmldll___soname_flags = $(COND_USE_SOVERSOLARIS_1___xmldll___soname_flags)
 @COND_GCC_PCH_1@__xmllib_PCH_DEP = .pch/wxprec_xmllib/wx/wxprec.h.gch
+@COND_GCC_PCH_1@__xmllib_PCH_INC = -I.pch/wxprec_xmllib
 COND_MONOLITHIC_0_SHARED_0___xmllib___depname = \
 	$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX).a
 @COND_MONOLITHIC_0_SHARED_0@__xmllib___depname = $(COND_MONOLITHIC_0_SHARED_0___xmllib___depname)
@@ -5979,144 +5996,64 @@ COND_MONOLITHIC_0_SHARED_0___xmllib___depname = \
 all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) $(__macos_res___depname)
 
 @COND_GCC_PCH_1@.pch/wxprec_advdll/wx/wxprec.h.gch: 
-@COND_GCC_PCH_1@	if test $(GCC_PCH) = "1" ; then\
-@COND_GCC_PCH_1@	mkdir -p .pch/wxprec_advdll ;\
-@COND_GCC_PCH_1@	rm -f .pch/wxprec_advdll/wx/wxprec.h.gch ;\
-@COND_GCC_PCH_1@	$(CXX) $(ADVDLL_CXXFLAGS) -o .pch/wxprec_advdll/wx/wxprec.h.gch $(srcdir)/wx/wxprec.h ;\
-@COND_GCC_PCH_1@	fi
+@COND_GCC_PCH_1@	$(top_builddir)./bk-make-pch .pch/wxprec_advdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ADVDLL_CXXFLAGS)
 
 @COND_GCC_PCH_1@.pch/wxprec_advlib/wx/wxprec.h.gch: 
-@COND_GCC_PCH_1@	if test $(GCC_PCH) = "1" ; then\
-@COND_GCC_PCH_1@	mkdir -p .pch/wxprec_advlib ;\
-@COND_GCC_PCH_1@	rm -f .pch/wxprec_advlib/wx/wxprec.h.gch ;\
-@COND_GCC_PCH_1@	$(CXX) $(ADVLIB_CXXFLAGS) -o .pch/wxprec_advlib/wx/wxprec.h.gch $(srcdir)/wx/wxprec.h ;\
-@COND_GCC_PCH_1@	fi
+@COND_GCC_PCH_1@	$(top_builddir)./bk-make-pch .pch/wxprec_advlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ADVLIB_CXXFLAGS)
 
 @COND_GCC_PCH_1@.pch/wxprec_basedll/wx/wxprec.h.gch: 
-@COND_GCC_PCH_1@	if test $(GCC_PCH) = "1" ; then\
-@COND_GCC_PCH_1@	mkdir -p .pch/wxprec_basedll ;\
-@COND_GCC_PCH_1@	rm -f .pch/wxprec_basedll/wx/wxprec.h.gch ;\
-@COND_GCC_PCH_1@	$(CXX) $(BASEDLL_CXXFLAGS) -o .pch/wxprec_basedll/wx/wxprec.h.gch $(srcdir)/wx/wxprec.h ;\
-@COND_GCC_PCH_1@	fi
+@COND_GCC_PCH_1@	$(top_builddir)./bk-make-pch .pch/wxprec_basedll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(BASEDLL_CXXFLAGS)
 
 @COND_GCC_PCH_1@.pch/wxprec_baselib/wx/wxprec.h.gch: 
-@COND_GCC_PCH_1@	if test $(GCC_PCH) = "1" ; then\
-@COND_GCC_PCH_1@	mkdir -p .pch/wxprec_baselib ;\
-@COND_GCC_PCH_1@	rm -f .pch/wxprec_baselib/wx/wxprec.h.gch ;\
-@COND_GCC_PCH_1@	$(CXX) $(BASELIB_CXXFLAGS) -o .pch/wxprec_baselib/wx/wxprec.h.gch $(srcdir)/wx/wxprec.h ;\
-@COND_GCC_PCH_1@	fi
+@COND_GCC_PCH_1@	$(top_builddir)./bk-make-pch .pch/wxprec_baselib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(BASELIB_CXXFLAGS)
 
 @COND_GCC_PCH_1@.pch/wxprec_coredll/wx/wxprec.h.gch: 
-@COND_GCC_PCH_1@	if test $(GCC_PCH) = "1" ; then\
-@COND_GCC_PCH_1@	mkdir -p .pch/wxprec_coredll ;\
-@COND_GCC_PCH_1@	rm -f .pch/wxprec_coredll/wx/wxprec.h.gch ;\
-@COND_GCC_PCH_1@	$(CXX) $(COREDLL_CXXFLAGS) -o .pch/wxprec_coredll/wx/wxprec.h.gch $(srcdir)/wx/wxprec.h ;\
-@COND_GCC_PCH_1@	fi
+@COND_GCC_PCH_1@	$(top_builddir)./bk-make-pch .pch/wxprec_coredll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(COREDLL_CXXFLAGS)
 
 @COND_GCC_PCH_1@.pch/wxprec_corelib/wx/wxprec.h.gch: 
-@COND_GCC_PCH_1@	if test $(GCC_PCH) = "1" ; then\
-@COND_GCC_PCH_1@	mkdir -p .pch/wxprec_corelib ;\
-@COND_GCC_PCH_1@	rm -f .pch/wxprec_corelib/wx/wxprec.h.gch ;\
-@COND_GCC_PCH_1@	$(CXX) $(CORELIB_CXXFLAGS) -o .pch/wxprec_corelib/wx/wxprec.h.gch $(srcdir)/wx/wxprec.h ;\
-@COND_GCC_PCH_1@	fi
+@COND_GCC_PCH_1@	$(top_builddir)./bk-make-pch .pch/wxprec_corelib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(CORELIB_CXXFLAGS)
 
 @COND_GCC_PCH_1@.pch/wxprec_dbgriddll/wx/wxprec.h.gch: 
-@COND_GCC_PCH_1@	if test $(GCC_PCH) = "1" ; then\
-@COND_GCC_PCH_1@	mkdir -p .pch/wxprec_dbgriddll ;\
-@COND_GCC_PCH_1@	rm -f .pch/wxprec_dbgriddll/wx/wxprec.h.gch ;\
-@COND_GCC_PCH_1@	$(CXX) $(DBGRIDDLL_CXXFLAGS) -o .pch/wxprec_dbgriddll/wx/wxprec.h.gch $(srcdir)/wx/wxprec.h ;\
-@COND_GCC_PCH_1@	fi
+@COND_GCC_PCH_1@	$(top_builddir)./bk-make-pch .pch/wxprec_dbgriddll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(DBGRIDDLL_CXXFLAGS)
 
 @COND_GCC_PCH_1@.pch/wxprec_dbgridlib/wx/wxprec.h.gch: 
-@COND_GCC_PCH_1@	if test $(GCC_PCH) = "1" ; then\
-@COND_GCC_PCH_1@	mkdir -p .pch/wxprec_dbgridlib ;\
-@COND_GCC_PCH_1@	rm -f .pch/wxprec_dbgridlib/wx/wxprec.h.gch ;\
-@COND_GCC_PCH_1@	$(CXX) $(DBGRIDLIB_CXXFLAGS) -o .pch/wxprec_dbgridlib/wx/wxprec.h.gch $(srcdir)/wx/wxprec.h ;\
-@COND_GCC_PCH_1@	fi
+@COND_GCC_PCH_1@	$(top_builddir)./bk-make-pch .pch/wxprec_dbgridlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(DBGRIDLIB_CXXFLAGS)
 
 @COND_GCC_PCH_1@.pch/wxprec_gldll/wx/wxprec.h.gch: 
-@COND_GCC_PCH_1@	if test $(GCC_PCH) = "1" ; then\
-@COND_GCC_PCH_1@	mkdir -p .pch/wxprec_gldll ;\
-@COND_GCC_PCH_1@	rm -f .pch/wxprec_gldll/wx/wxprec.h.gch ;\
-@COND_GCC_PCH_1@	$(CXX) $(GLDLL_CXXFLAGS) -o .pch/wxprec_gldll/wx/wxprec.h.gch $(srcdir)/wx/wxprec.h ;\
-@COND_GCC_PCH_1@	fi
+@COND_GCC_PCH_1@	$(top_builddir)./bk-make-pch .pch/wxprec_gldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GLDLL_CXXFLAGS)
 
 @COND_GCC_PCH_1@.pch/wxprec_gllib/wx/wxprec.h.gch: 
-@COND_GCC_PCH_1@	if test $(GCC_PCH) = "1" ; then\
-@COND_GCC_PCH_1@	mkdir -p .pch/wxprec_gllib ;\
-@COND_GCC_PCH_1@	rm -f .pch/wxprec_gllib/wx/wxprec.h.gch ;\
-@COND_GCC_PCH_1@	$(CXX) $(GLLIB_CXXFLAGS) -o .pch/wxprec_gllib/wx/wxprec.h.gch $(srcdir)/wx/wxprec.h ;\
-@COND_GCC_PCH_1@	fi
+@COND_GCC_PCH_1@	$(top_builddir)./bk-make-pch .pch/wxprec_gllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GLLIB_CXXFLAGS)
 
 @COND_GCC_PCH_1@.pch/wxprec_htmldll/wx/wxprec.h.gch: 
-@COND_GCC_PCH_1@	if test $(GCC_PCH) = "1" ; then\
-@COND_GCC_PCH_1@	mkdir -p .pch/wxprec_htmldll ;\
-@COND_GCC_PCH_1@	rm -f .pch/wxprec_htmldll/wx/wxprec.h.gch ;\
-@COND_GCC_PCH_1@	$(CXX) $(HTMLDLL_CXXFLAGS) -o .pch/wxprec_htmldll/wx/wxprec.h.gch $(srcdir)/wx/wxprec.h ;\
-@COND_GCC_PCH_1@	fi
+@COND_GCC_PCH_1@	$(top_builddir)./bk-make-pch .pch/wxprec_htmldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(HTMLDLL_CXXFLAGS)
 
 @COND_GCC_PCH_1@.pch/wxprec_htmllib/wx/wxprec.h.gch: 
-@COND_GCC_PCH_1@	if test $(GCC_PCH) = "1" ; then\
-@COND_GCC_PCH_1@	mkdir -p .pch/wxprec_htmllib ;\
-@COND_GCC_PCH_1@	rm -f .pch/wxprec_htmllib/wx/wxprec.h.gch ;\
-@COND_GCC_PCH_1@	$(CXX) $(HTMLLIB_CXXFLAGS) -o .pch/wxprec_htmllib/wx/wxprec.h.gch $(srcdir)/wx/wxprec.h ;\
-@COND_GCC_PCH_1@	fi
+@COND_GCC_PCH_1@	$(top_builddir)./bk-make-pch .pch/wxprec_htmllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(HTMLLIB_CXXFLAGS)
 
 @COND_GCC_PCH_1@.pch/wxprec_monodll/wx/wxprec.h.gch: 
-@COND_GCC_PCH_1@	if test $(GCC_PCH) = "1" ; then\
-@COND_GCC_PCH_1@	mkdir -p .pch/wxprec_monodll ;\
-@COND_GCC_PCH_1@	rm -f .pch/wxprec_monodll/wx/wxprec.h.gch ;\
-@COND_GCC_PCH_1@	$(CXX) $(MONODLL_CXXFLAGS) -o .pch/wxprec_monodll/wx/wxprec.h.gch $(srcdir)/wx/wxprec.h ;\
-@COND_GCC_PCH_1@	fi
+@COND_GCC_PCH_1@	$(top_builddir)./bk-make-pch .pch/wxprec_monodll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MONODLL_CXXFLAGS)
 
 @COND_GCC_PCH_1@.pch/wxprec_monolib/wx/wxprec.h.gch: 
-@COND_GCC_PCH_1@	if test $(GCC_PCH) = "1" ; then\
-@COND_GCC_PCH_1@	mkdir -p .pch/wxprec_monolib ;\
-@COND_GCC_PCH_1@	rm -f .pch/wxprec_monolib/wx/wxprec.h.gch ;\
-@COND_GCC_PCH_1@	$(CXX) $(MONOLIB_CXXFLAGS) -o .pch/wxprec_monolib/wx/wxprec.h.gch $(srcdir)/wx/wxprec.h ;\
-@COND_GCC_PCH_1@	fi
+@COND_GCC_PCH_1@	$(top_builddir)./bk-make-pch .pch/wxprec_monolib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MONOLIB_CXXFLAGS)
 
 @COND_GCC_PCH_1@.pch/wxprec_netdll/wx/wxprec.h.gch: 
-@COND_GCC_PCH_1@	if test $(GCC_PCH) = "1" ; then\
-@COND_GCC_PCH_1@	mkdir -p .pch/wxprec_netdll ;\
-@COND_GCC_PCH_1@	rm -f .pch/wxprec_netdll/wx/wxprec.h.gch ;\
-@COND_GCC_PCH_1@	$(CXX) $(NETDLL_CXXFLAGS) -o .pch/wxprec_netdll/wx/wxprec.h.gch $(srcdir)/wx/wxprec.h ;\
-@COND_GCC_PCH_1@	fi
+@COND_GCC_PCH_1@	$(top_builddir)./bk-make-pch .pch/wxprec_netdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETDLL_CXXFLAGS)
 
 @COND_GCC_PCH_1@.pch/wxprec_netlib/wx/wxprec.h.gch: 
-@COND_GCC_PCH_1@	if test $(GCC_PCH) = "1" ; then\
-@COND_GCC_PCH_1@	mkdir -p .pch/wxprec_netlib ;\
-@COND_GCC_PCH_1@	rm -f .pch/wxprec_netlib/wx/wxprec.h.gch ;\
-@COND_GCC_PCH_1@	$(CXX) $(NETLIB_CXXFLAGS) -o .pch/wxprec_netlib/wx/wxprec.h.gch $(srcdir)/wx/wxprec.h ;\
-@COND_GCC_PCH_1@	fi
+@COND_GCC_PCH_1@	$(top_builddir)./bk-make-pch .pch/wxprec_netlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETLIB_CXXFLAGS)
 
 @COND_GCC_PCH_1@.pch/wxprec_odbcdll/wx/wxprec.h.gch: 
-@COND_GCC_PCH_1@	if test $(GCC_PCH) = "1" ; then\
-@COND_GCC_PCH_1@	mkdir -p .pch/wxprec_odbcdll ;\
-@COND_GCC_PCH_1@	rm -f .pch/wxprec_odbcdll/wx/wxprec.h.gch ;\
-@COND_GCC_PCH_1@	$(CXX) $(ODBCDLL_CXXFLAGS) -o .pch/wxprec_odbcdll/wx/wxprec.h.gch $(srcdir)/wx/wxprec.h ;\
-@COND_GCC_PCH_1@	fi
+@COND_GCC_PCH_1@	$(top_builddir)./bk-make-pch .pch/wxprec_odbcdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ODBCDLL_CXXFLAGS)
 
 @COND_GCC_PCH_1@.pch/wxprec_odbclib/wx/wxprec.h.gch: 
-@COND_GCC_PCH_1@	if test $(GCC_PCH) = "1" ; then\
-@COND_GCC_PCH_1@	mkdir -p .pch/wxprec_odbclib ;\
-@COND_GCC_PCH_1@	rm -f .pch/wxprec_odbclib/wx/wxprec.h.gch ;\
-@COND_GCC_PCH_1@	$(CXX) $(ODBCLIB_CXXFLAGS) -o .pch/wxprec_odbclib/wx/wxprec.h.gch $(srcdir)/wx/wxprec.h ;\
-@COND_GCC_PCH_1@	fi
+@COND_GCC_PCH_1@	$(top_builddir)./bk-make-pch .pch/wxprec_odbclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ODBCLIB_CXXFLAGS)
 
 @COND_GCC_PCH_1@.pch/wxprec_xmldll/wx/wxprec.h.gch: 
-@COND_GCC_PCH_1@	if test $(GCC_PCH) = "1" ; then\
-@COND_GCC_PCH_1@	mkdir -p .pch/wxprec_xmldll ;\
-@COND_GCC_PCH_1@	rm -f .pch/wxprec_xmldll/wx/wxprec.h.gch ;\
-@COND_GCC_PCH_1@	$(CXX) $(XMLDLL_CXXFLAGS) -o .pch/wxprec_xmldll/wx/wxprec.h.gch $(srcdir)/wx/wxprec.h ;\
-@COND_GCC_PCH_1@	fi
+@COND_GCC_PCH_1@	$(top_builddir)./bk-make-pch .pch/wxprec_xmldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XMLDLL_CXXFLAGS)
 
 @COND_GCC_PCH_1@.pch/wxprec_xmllib/wx/wxprec.h.gch: 
-@COND_GCC_PCH_1@	if test $(GCC_PCH) = "1" ; then\
-@COND_GCC_PCH_1@	mkdir -p .pch/wxprec_xmllib ;\
-@COND_GCC_PCH_1@	rm -f .pch/wxprec_xmllib/wx/wxprec.h.gch ;\
-@COND_GCC_PCH_1@	$(CXX) $(XMLLIB_CXXFLAGS) -o .pch/wxprec_xmllib/wx/wxprec.h.gch $(srcdir)/wx/wxprec.h ;\
-@COND_GCC_PCH_1@	fi
+@COND_GCC_PCH_1@	$(top_builddir)./bk-make-pch .pch/wxprec_xmllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XMLLIB_CXXFLAGS)
 
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__advdll_PCH_DEP)  $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname)
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@	$(SHARED_LD_CXX) $@ $(ADVDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__advdll___macinstnamecmd) $(__advdll___importlib) $(__advdll___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)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
@@ -6548,8 +6485,8 @@ basedll_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp
 basedll_unzip.o: $(srcdir)/src/common/unzip.c
 	$(CCC) -c -o $@ $(BASEDLL_CFLAGS) $<
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@basedll_utils.o: $(srcdir)/src/mac/utils.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+@COND_TOOLKIT_MAC@basedll_utils.o: $(srcdir)/src/mac/utils.cpp
+@COND_TOOLKIT_MAC@	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 @COND_PLATFORM_WIN32_1@basedll_utils.o: $(srcdir)/src/msw/utils.cpp
 @COND_PLATFORM_WIN32_1@	$(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
@@ -6823,8 +6760,8 @@ baselib_txtstrm.o: $(srcdir)/src/common/txtstrm.cpp
 baselib_unzip.o: $(srcdir)/src/common/unzip.c
 	$(CCC) -c -o $@ $(BASELIB_CFLAGS) $<
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@baselib_utils.o: $(srcdir)/src/mac/utils.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+@COND_TOOLKIT_MAC@baselib_utils.o: $(srcdir)/src/mac/utils.cpp
+@COND_TOOLKIT_MAC@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 @COND_PLATFORM_WIN32_1@baselib_utils.o: $(srcdir)/src/msw/utils.cpp
 @COND_PLATFORM_WIN32_1@	$(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
@@ -6912,6 +6849,7 @@ clean:
 	rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
 	rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
 	rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a
+	(cd samples && $(MAKE) clean)
 	rm -f lib/libwx_$(TOOLCHAIN_NAME).0.rsrc lib/libwx_$(TOOLCHAIN_NAME).0.r
 
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__coredll_PCH_DEP)  $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname)
@@ -8868,6 +8806,9 @@ coredll_uma.o: $(srcdir)/src/mac/uma.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_utils.o: $(srcdir)/src/motif/utils.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_MAC@coredll_utils.o: $(srcdir)/src/mac/utils.cpp
+@COND_TOOLKIT_MAC@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_utils.o: $(srcdir)/src/cocoa/utils.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -10928,6 +10869,9 @@ corelib_uma.o: $(srcdir)/src/mac/uma.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_utils.o: $(srcdir)/src/motif/utils.cpp
 @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_MAC@corelib_utils.o: $(srcdir)/src/mac/utils.cpp
+@COND_TOOLKIT_MAC@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_utils.o: $(srcdir)/src/cocoa/utils.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -11049,7 +10993,7 @@ dbgridlib_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp
 	$(CXXC) -c -o $@ $(DBGRIDLIB_CXXFLAGS) $<
 
 distclean: clean
-	rm -f configure config.cache config.log config.status bk-deps shared-ld-sh Makefile
+	rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__gldll_PCH_DEP)  $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname)
 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@	$(SHARED_LD_CXX) $@ $(GLDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__gldll___macinstnamecmd) $(__gldll___importlib) $(__gldll___soname_flags) $(dll___macver) $(EXTRALIBS_OPENGL)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p)
@@ -11243,6 +11187,17 @@ install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__in
 	fi; \
 	$(INSTALL_DATA) $(srcdir)/include//$$f $(includedir)/$$f; \
 	done
+	@echo " "
+	@echo " The installation of wxWindows is finished.  On certain"
+	@echo " platforms (e.g. Linux) you'll now have to run ldconfig"
+	@echo " if you installed a shared library and also modify the"
+	@echo " LD_LIBRARY_PATH (or equivalent) environment variable."
+	@echo " "
+	@echo " wxWindows comes with no guarantees and doesn't claim"
+	@echo " to be suitable for any purpose."
+	@echo " "
+	@echo " Read the wxWindows Licence on licencing conditions."
+	@echo " "
 
 @COND_USE_GUI_1@install-afm: 
 @COND_USE_GUI_1@	$(INSTALL_DIR) $(datadir)/wx/2.5/afm
@@ -11359,33 +11314,33 @@ install-wxconfig:
 @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)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a $(libdir)
 
-@COND_WXUSE_EXPAT_BUILTIN@install_wxexpat: 
-@COND_WXUSE_EXPAT_BUILTIN@	$(INSTALL_DIR) $(libdir)
-@COND_WXUSE_EXPAT_BUILTIN@	$(INSTALL_DATA) $(LIBDIRNAME)/libwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(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)/libwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir)
 
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@install_wxjpeg: 
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	$(INSTALL_DIR) $(libdir)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	$(INSTALL_DATA) $(LIBDIRNAME)/libwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(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)/libwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir)
 
-@COND_WXUSE_ODBC_BUILTIN@install_wxodbc: 
-@COND_WXUSE_ODBC_BUILTIN@	$(INSTALL_DIR) $(libdir)
-@COND_WXUSE_ODBC_BUILTIN@	$(INSTALL_DATA) $(LIBDIRNAME)/libwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(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)/libwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir)
 
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@install_wxpng: 
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	$(INSTALL_DIR) $(libdir)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	$(INSTALL_DATA) $(LIBDIRNAME)/libwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(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)/libwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir)
 
-@COND_WXUSE_REGEX_BUILTIN@install_wxregex: 
-@COND_WXUSE_REGEX_BUILTIN@	$(INSTALL_DIR) $(libdir)
-@COND_WXUSE_REGEX_BUILTIN@	$(INSTALL_DATA) $(LIBDIRNAME)/libwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(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)/libwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir)
 
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@install_wxtiff: 
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	$(INSTALL_DIR) $(libdir)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	$(INSTALL_DATA) $(LIBDIRNAME)/libwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(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)/libwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir)
 
-@COND_WXUSE_ZLIB_BUILTIN@install_wxzlib: 
-@COND_WXUSE_ZLIB_BUILTIN@	$(INSTALL_DIR) $(libdir)
-@COND_WXUSE_ZLIB_BUILTIN@	$(INSTALL_DATA) $(LIBDIRNAME)/libwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(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)/libwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir)
 
 @COND_MONOLITHIC_0_SHARED_1@install_xmldll: 
 @COND_MONOLITHIC_0_SHARED_1@	$(INSTALL_DIR) $(libdir)
@@ -13767,8 +13722,8 @@ monodll_url.o: $(srcdir)/src/common/url.cpp
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_utils.o: $(srcdir)/src/x11/utils.cpp
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monodll_utils.o: $(srcdir)/src/mac/utils.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+@COND_TOOLKIT_MAC@monodll_utils.o: $(srcdir)/src/mac/utils.cpp
+@COND_TOOLKIT_MAC@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_utils.o: $(srcdir)/src/cocoa/utils.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
@@ -16286,8 +16241,8 @@ monolib_url.o: $(srcdir)/src/common/url.cpp
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_utils.o: $(srcdir)/src/x11/utils.cpp
 @COND_TOOLKIT_X11_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monolib_utils.o: $(srcdir)/src/mac/utils.cpp
-@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+@COND_TOOLKIT_MAC@monolib_utils.o: $(srcdir)/src/mac/utils.cpp
+@COND_TOOLKIT_MAC@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_utils.o: $(srcdir)/src/cocoa/utils.cpp
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
@@ -16562,6 +16517,9 @@ odbclib_db.o: $(srcdir)/src/common/db.cpp
 odbclib_dbtable.o: $(srcdir)/src/common/dbtable.cpp
 	$(CXXC) -c -o $@ $(ODBCLIB_CXXFLAGS) $<
 
+samples: 
+	(cd samples && $(MAKE) all)
+
 uninstall: 
 
 @COND_WXUSE_EXPAT_BUILTIN@$(LIBDIRNAME)/libwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a: $(WXEXPAT_OBJECTS)
@@ -17020,4 +16978,4 @@ xmllib_xml.o: $(srcdir)/src/xml/xml.cpp
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
-.PHONY: all clean distclean install install_advdll install_advlib install_basedll install_baselib install_coredll install_corelib install_dbgriddll install_dbgridlib install_gldll install_gllib install_htmldll install_htmllib install_monodll install_monolib install_netdll install_netlib install_odbcdll install_odbclib install_wxexpat install_wxjpeg install_wxodbc install_wxpng install_wxregex install_wxtiff install_wxzlib install_xmldll install_xmllib uninstall
+.PHONY: all clean distclean install install_advdll install_advlib install_basedll install_baselib install_coredll install_corelib install_dbgriddll install_dbgridlib install_gldll install_gllib install_htmldll install_htmllib install_monodll install_monolib install_netdll install_netlib install_odbcdll install_odbclib install_wxexpat install_wxjpeg install_wxodbc install_wxpng install_wxregex install_wxtiff install_wxzlib install_xmldll install_xmllib samples uninstall