From 458425003481da3dde531a9677014b07070b7095 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 9 Aug 2003 11:52:38 +0000 Subject: [PATCH] added support for gcc precompiled headers git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 757 +++++++++++++++++------------ aclocal.m4 | 94 +++- autoconf_inc.m4 | 228 ++++----- configure | 201 ++++++-- configure.in | 15 + contrib/src/animate/Makefile.in | 39 +- contrib/src/deprecated/Makefile.in | 59 ++- contrib/src/fl/Makefile.in | 37 +- contrib/src/gizmos/Makefile.in | 37 +- contrib/src/mmedia/Makefile.in | 37 +- contrib/src/net/Makefile.in | 39 +- contrib/src/ogl/Makefile.in | 37 +- contrib/src/plot/Makefile.in | 37 +- contrib/src/stc/Makefile.in | 5 +- contrib/src/svg/Makefile.in | 37 +- contrib/src/xrc/Makefile.in | 39 +- src/stc/Makefile.in | 5 +- src/xrc/Makefile.in | 39 +- 18 files changed, 1084 insertions(+), 658 deletions(-) diff --git a/Makefile.in b/Makefile.in index 206c7c731b..a3a2ea8d24 100644 --- a/Makefile.in +++ b/Makefile.in @@ -51,10 +51,11 @@ top_srcdir = @top_srcdir@ ### Variables: ### -ADVDLL_CXXFLAGS = $(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) $(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_OBJECTS = \ advdll_calctrl.o \ advdll_dcbuffer.o \ @@ -68,10 +69,10 @@ ADVDLL_OBJECTS = \ advdll_tipdlg.o \ advdll_wizard.o \ $(__ADVANCED_PLATFORM_SRC_OBJECTS_2) -ADVLIB_CXXFLAGS = $(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) $(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_OBJECTS = \ advlib_calctrl.o \ advlib_dcbuffer.o \ @@ -231,14 +232,16 @@ ALL_HEADERS = \ wx/dbkeyg.h \ wx/dbtable.h \ wx/dbgrid.h -BASEDLL_CFLAGS = $(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 = $(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 $(CXXFLAGS) $(PIC_FLAG) +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)__ \ + $(__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) BASEDLL_OBJECTS = \ basedll_appbase.o \ basedll_clntdata.o \ @@ -296,14 +299,14 @@ BASEDLL_OBJECTS = \ basedll_msgout.o \ basedll_utilscmn.o \ $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2) -BASELIB_CFLAGS = $(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 = $(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) +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 = $(__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) BASELIB_OBJECTS = \ baselib_appbase.o \ baselib_clntdata.o \ @@ -361,14 +364,16 @@ BASELIB_OBJECTS = \ baselib_msgout.o \ baselib_utilscmn.o \ $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3) -COREDLL_CFLAGS = $(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 = $(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) +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 = $(__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) COREDLL_OBJECTS = \ coredll_event.o \ coredll_fs_mem.o \ @@ -376,14 +381,14 @@ COREDLL_OBJECTS = \ coredll_utilscmn.o \ $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4) \ $(__CORE_SRC_OBJECTS_2) -CORELIB_CFLAGS = $(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 = $(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) +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)__ \ + $(__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) CORELIB_OBJECTS = \ corelib_event.o \ corelib_fs_mem.o \ @@ -391,34 +396,37 @@ CORELIB_OBJECTS = \ corelib_utilscmn.o \ $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5) \ $(__CORE_SRC_OBJECTS_3) -DBGRIDDLL_CXXFLAGS = $(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_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 = $(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_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 = $(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_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 = $(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) $(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 = $(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 $(CXXFLAGS) $(PIC_FLAG) +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 \ + $(CXXFLAGS) $(PIC_FLAG) HTMLDLL_OBJECTS = \ $(__HTML_SRC_PLATFORM_OBJECTS_2) \ htmldll_helpctrl.o \ @@ -442,10 +450,10 @@ HTMLDLL_OBJECTS = \ htmldll_m_tables.o \ htmldll_winpars.o \ htmldll_htmllbox.o -HTMLLIB_CXXFLAGS = $(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) +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) HTMLLIB_OBJECTS = \ $(__HTML_SRC_PLATFORM_OBJECTS_3) \ htmllib_helpctrl.o \ @@ -470,14 +478,16 @@ HTMLLIB_OBJECTS = \ htmllib_winpars.o \ htmllib_htmllbox.o LIBDIRNAME = $(top_builddir)lib -MONODLL_CFLAGS = $(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 = $(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) +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 = $(__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) MONODLL_OBJECTS = \ monodll_appbase.o \ monodll_clntdata.o \ @@ -548,14 +558,14 @@ MONODLL_OBJECTS = \ $(__NET_PLATFORM_SRC_OBJECTS) \ $(__MONOLIB_GUI_SRC_OBJECTS) \ monodll_xml.o -MONOLIB_CFLAGS = $(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 = $(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) +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)__ \ + $(__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) MONOLIB_OBJECTS = \ monolib_appbase.o \ monolib_clntdata.o \ @@ -626,14 +636,16 @@ MONOLIB_OBJECTS = \ $(__NET_PLATFORM_SRC_OBJECTS_1) \ $(__MONOLIB_GUI_SRC_OBJECTS_1) \ monolib_xml.o -NETDLL_CFLAGS = $(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 = $(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) $(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_OBJECTS = \ netdll_fs_inet.o \ netdll_ftp.o \ @@ -646,14 +658,16 @@ NETDLL_OBJECTS = \ netdll_socket.o \ netdll_url.o \ $(__NET_PLATFORM_SRC_OBJECTS_2) -NETLIB_CFLAGS = $(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 = $(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) +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 = $(__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) NETLIB_OBJECTS = \ netlib_fs_inet.o \ netlib_ftp.o \ @@ -666,17 +680,18 @@ NETLIB_OBJECTS = \ netlib_socket.o \ netlib_url.o \ $(__NET_PLATFORM_SRC_OBJECTS_3) -ODBCDLL_CXXFLAGS = $(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_ODBC $(CXXFLAGS) $(PIC_FLAG) +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 \ + -DWXMAKINGDLL_ODBC $(CXXFLAGS) $(PIC_FLAG) ODBCDLL_OBJECTS = \ odbcdll_db.o \ odbcdll_dbtable.o -ODBCLIB_CXXFLAGS = $(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) +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) ODBCLIB_OBJECTS = \ odbclib_db.o \ odbclib_dbtable.o @@ -826,16 +841,17 @@ WXZLIB_OBJECTS = \ wxzlib_infcodes.o \ wxzlib_infutil.o \ wxzlib_inffast.o -XMLDLL_CXXFLAGS = $(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) $(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 = $(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) $(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_OBJECTS = \ xmllib_xml.o @@ -2368,7 +2384,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 \ @@ -2463,7 +2479,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 \ @@ -2606,7 +2622,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 \ @@ -2701,7 +2717,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 \ @@ -4839,178 +4855,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 \ @@ -5048,9 +4892,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 \ @@ -5078,8 +4922,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 \ @@ -5091,8 +4935,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 \ @@ -5140,9 +4984,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 \ @@ -5180,6 +5024,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 = \ @@ -5483,6 +5499,8 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @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) @@ -5518,9 +5536,13 @@ COND_USE_SOVERLINUX_1___advdll___soname_flags = \ 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) @@ -5556,9 +5578,13 @@ COND_USE_SOVERLINUX_1___basedll___soname_flags = \ 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) @@ -5594,9 +5620,13 @@ COND_USE_SOVERLINUX_1___coredll___soname_flags = \ 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) @@ -5632,9 +5662,13 @@ COND_USE_SOVERLINUX_1___dbgriddll___soname_flags = \ 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) @@ -5670,9 +5704,13 @@ COND_USE_SOVERLINUX_1___gldll___soname_flags = \ 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) @@ -5708,6 +5746,8 @@ COND_USE_SOVERLINUX_1___htmldll___soname_flags = \ 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) @@ -5757,6 +5797,8 @@ COND_MONOLITHIC_0_SHARED_0_USE_HTML_1___htmllib___depname = \ @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) @@ -5792,9 +5834,13 @@ COND_USE_SOVERLINUX_1___monodll___soname_flags = \ 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) @@ -5830,9 +5876,13 @@ COND_USE_SOVERLINUX_1___netdll___soname_flags = \ 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) @@ -5868,6 +5918,8 @@ COND_USE_SOVERLINUX_1___odbcdll___soname_flags = \ 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) @@ -5888,6 +5940,8 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1___odbclib___depname = \ @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ $(LIBDIRNAME)/libwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX).a @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) @@ -5923,6 +5977,8 @@ COND_USE_SOVERLINUX_1___xmldll___soname_flags = \ 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) @@ -5941,7 +5997,67 @@ 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_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__coredll___depname) $(__basedll___depname) +@COND_GCC_PCH_1@.pch/wxprec_advdll/wx/wxprec.h.gch: +@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@ $(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@ $(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@ $(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@ $(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@ $(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@ $(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@ $(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@ $(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@ $(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@ $(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@ $(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@ $(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@ $(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@ $(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@ $(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@ $(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@ $(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@ $(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@ $(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) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__advdll___so_symlinks_cmd) @@ -6038,7 +6154,7 @@ advdll_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX).a: $(ADVLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX).a: $(__advlib_PCH_DEP) $(ADVLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ rm -f $@ @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(AR) rcu $@ $(ADVLIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(RANLIB) $@ @@ -6136,7 +6252,7 @@ advlib_tipdlg.o: $(srcdir)/src/generic/tipdlg.cpp advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) +@COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__basedll_PCH_DEP) $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_MONOLITHIC_0_SHARED_1@ $(SHARED_LD_CXX) $@ $(BASEDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__basedll___macinstnamecmd) $(__basedll___importlib) $(__basedll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) @COND_MONOLITHIC_0_SHARED_1@ $(__basedll___so_symlinks_cmd) @@ -6410,7 +6526,7 @@ basedll_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp basedll_zstream.o: $(srcdir)/src/common/zstream.cpp $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a: $(BASELIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) +@COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a: $(__baselib_PCH_DEP) $(BASELIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_MONOLITHIC_0_SHARED_0@ rm -f $@ @COND_MONOLITHIC_0_SHARED_0@ $(AR) rcu $@ $(BASELIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0@ $(RANLIB) $@ @@ -6686,7 +6802,7 @@ baselib_zstream.o: $(srcdir)/src/common/zstream.cpp $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $< clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f $(LIBDIRNAME)/libwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX).a rm -f $(LIBDIRNAME)/libwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX).a @@ -6737,7 +6853,7 @@ clean: rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a 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_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname) +@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) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@ $(COREDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__coredll___macinstnamecmd) $(__coredll___importlib) $(__coredll___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_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__coredll___so_symlinks_cmd) @@ -8796,7 +8912,7 @@ coredll_winuniv.o: $(srcdir)/src/univ/winuniv.cpp @COND_USE_GUI_1@coredll_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX).a: $(CORELIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX).a: $(__corelib_PCH_DEP) $(CORELIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ rm -f $@ @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(AR) rcu $@ $(CORELIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ $(RANLIB) $@ @@ -10856,14 +10972,14 @@ corelib_winuniv.o: $(srcdir)/src/univ/winuniv.cpp @COND_USE_GUI_1@corelib_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__dbgriddll_PCH_DEP) $(DBGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__advdll___depname) $(__odbcdll___depname) $(__coredll___depname) $(__basedll___depname) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(SHARED_LD_CXX) $@ $(DBGRIDDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__dbgriddll___macinstnamecmd) $(__dbgriddll___importlib) $(__dbgriddll___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)_adv-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(__dbgriddll___so_symlinks_cmd) dbgriddll_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp $(CXXC) -c -o $@ $(DBGRIDDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX).a: $(DBGRIDLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_dbgrid-2.5$(HOST_SUFFIX).a: $(__dbgridlib_PCH_DEP) $(DBGRIDLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ rm -f $@ @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(AR) rcu $@ $(DBGRIDLIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(RANLIB) $@ @@ -10872,10 +10988,9 @@ dbgridlib_dbgrid.o: $(srcdir)/src/common/dbgrid.cpp $(CXXC) -c -o $@ $(DBGRIDLIB_CXXFLAGS) $< distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + 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_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) +@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) @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(__gldll___so_symlinks_cmd) @@ -10894,7 +11009,7 @@ distclean: clean @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)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a: $(GLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) +@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a: $(__gllib_PCH_DEP) $(GLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @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) $@ @@ -10914,7 +11029,7 @@ distclean: clean @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_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@$(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)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@ $(__htmldll___so_symlinks_cmd) @@ -10984,7 +11099,7 @@ htmldll_m_tables.o: $(srcdir)/src/html/m_tables.cpp htmldll_winpars.o: $(srcdir)/src/html/winpars.cpp $(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX).a: $(HTMLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) +@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX).a: $(__htmllib_PCH_DEP) $(HTMLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@ rm -f $@ @COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@ $(AR) rcu $@ $(HTMLLIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@ $(RANLIB) $@ @@ -11229,7 +11344,7 @@ install-wxconfig: @COND_TOOLKIT_MAC@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).0.r $(libdir) @COND_TOOLKIT_MAC@ $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).0.rsrc $(libdir) -@COND_MONOLITHIC_1_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) +@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@ $(__monodll___so_symlinks_cmd) @@ -13747,7 +13862,7 @@ monodll_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp monodll_zstream.o: $(srcdir)/src/common/zstream.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_MONOLITHIC_1_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a: $(MONOLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) +@COND_MONOLITHIC_1_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a: $(__monolib_PCH_DEP) $(MONOLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_MONOLITHIC_1_SHARED_0@ rm -f $@ @COND_MONOLITHIC_1_SHARED_0@ $(AR) rcu $@ $(MONOLIB_OBJECTS) @COND_MONOLITHIC_1_SHARED_0@ $(RANLIB) $@ @@ -16266,7 +16381,7 @@ monolib_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp monolib_zstream.o: $(srcdir)/src/common/zstream.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname) +@COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__netdll_PCH_DEP) $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname) @COND_MONOLITHIC_0_SHARED_1@ $(SHARED_LD_CXX) $@ $(NETDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__netdll___macinstnamecmd) $(__netdll___importlib) $(__netdll___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) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @COND_MONOLITHIC_0_SHARED_1@ $(__netdll___so_symlinks_cmd) @@ -16315,7 +16430,7 @@ netdll_socket.o: $(srcdir)/src/common/socket.cpp netdll_url.o: $(srcdir)/src/common/url.cpp $(CXXC) -c -o $@ $(NETDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX).a: $(NETLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) +@COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net-2.5$(HOST_SUFFIX).a: $(__netlib_PCH_DEP) $(NETLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_MONOLITHIC_0_SHARED_0@ rm -f $@ @COND_MONOLITHIC_0_SHARED_0@ $(AR) rcu $@ $(NETLIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0@ $(RANLIB) $@ @@ -16365,7 +16480,7 @@ netlib_socket.o: $(srcdir)/src/common/socket.cpp netlib_url.o: $(srcdir)/src/common/url.cpp $(CXXC) -c -o $@ $(NETLIB_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname) +@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__odbcdll_PCH_DEP) $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(SHARED_LD_CXX) $@ $(ODBCDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__odbcdll___macinstnamecmd) $(__odbcdll___importlib) $(__odbcdll___soname_flags) $(dll___macver) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(EXTRALIBS_ODBC) @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@ $(__odbcdll___so_symlinks_cmd) @@ -16375,7 +16490,7 @@ odbcdll_db.o: $(srcdir)/src/common/db.cpp odbcdll_dbtable.o: $(srcdir)/src/common/dbtable.cpp $(CXXC) -c -o $@ $(ODBCDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a: $(ODBCLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) +@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc-2.5$(HOST_SUFFIX).a: $(__odbclib_PCH_DEP) $(ODBCLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ rm -f $@ @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(AR) rcu $@ $(ODBCLIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@ $(RANLIB) $@ @@ -16825,14 +16940,14 @@ wxzlib_uncompr.o: $(srcdir)/src/zlib/uncompr.c wxzlib_zutil.o: $(srcdir)/src/zlib/zutil.c $(CCC) -c -o $@ $(WXZLIB_CFLAGS) $< -@COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname) +@COND_MONOLITHIC_0_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__xmldll_PCH_DEP) $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__basedll___depname) @COND_MONOLITHIC_0_SHARED_1@ $(SHARED_LD_CXX) $@ $(XMLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__xmldll___macinstnamecmd) $(__xmldll___importlib) $(__xmldll___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) $(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(EXTRALIBS_XML) @COND_MONOLITHIC_0_SHARED_1@ $(__xmldll___so_symlinks_cmd) xmldll_xml.o: $(srcdir)/src/xml/xml.cpp $(CXXC) -c -o $@ $(XMLDLL_CXXFLAGS) $< -@COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX).a: $(XMLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) +@COND_MONOLITHIC_0_SHARED_0@$(LIBDIRNAME)/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX).a: $(__xmllib_PCH_DEP) $(XMLLIB_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) @COND_MONOLITHIC_0_SHARED_0@ rm -f $@ @COND_MONOLITHIC_0_SHARED_0@ $(AR) rcu $@ $(XMLLIB_OBJECTS) @COND_MONOLITHIC_0_SHARED_0@ $(RANLIB) $@ diff --git a/aclocal.m4 b/aclocal.m4 index 0fce80ca4d..fedb14b8b3 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1503,8 +1503,8 @@ AC_DEFUN(AC_BAKEFILE_DEPS, cat <bk-deps #!/bin/sh -# This script is part of Bakefile (http://bakefile.sf.net) autoconf script. -# It is used to track C/C++ files dependencies in portable way. +# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf +# script. It is used to track C/C++ files dependencies in portable way. # # Permission is given to use this file in any way. @@ -1632,6 +1632,96 @@ AC_DEFUN(AC_BAKEFILE_RES_COMPILERS, AC_SUBST(SETFILE) ]) +dnl --------------------------------------------------------------------------- +dnl AC_BAKEFILE_PRECOMP_HEADERS +dnl +dnl Check for precompiled headers support (GCC >= 3.4) +dnl --------------------------------------------------------------------------- + +AC_DEFUN(AC_BAKEFILE_PRECOMP_HEADERS, +[ + + AC_ARG_ENABLE([precomp-headers], + [ --disable-precomp-headers don't use precompiled headers even if compiler can], + [bk_use_pch="$enableval"]) + + GCC_PCH=0 + + if test "x$bk_use_pch" = "x" -o "x$bk_use_pch" = "xyes" ; then + if test "x$GCC" = "xyes"; then + dnl test if we have gcc-3.4: + AC_MSG_CHECKING([if the compiler supports precompiled headers]) + AC_TRY_COMPILE([], + [ + #if !defined(__GNUC__) || !defined(__GNUC_MINOR__) || \ + (__GNUC__ < 3) || (__GNUC__ == 3 && __GNUC_MINOR__ < 4) + #error "no pch support" + #endif + ], + [ + AC_MSG_RESULT([yes]) + dnl FIXME - this is temporary, till .gch dependencies + dnl are fixed in generated Makefiles + CPPFLAGS="-fpch-deps $CPPFLAGS" + GCC_PCH=1 + ], + [ + AC_MSG_RESULT([no]) + ]) + if test $GCC_PCH = 1 ; then + cat <bk-make-pch +#!/bin/sh + +# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf +# script. It is used to generated precompiled headers. +# +# Permission is given to use this file in any way. + +outfile="\${1}" +header="\${2}" +shift +shift + +compiler= +headerfile= +while test \${#} -gt 0; do + case "\${1}" in + -I* ) + incdir=\`echo \${1} | sed -e 's/-I\(.*\)/\1/g'\` + if test "x\${headerfile}" = "x" -a -f "\${incdir}/\${header}" ; then + headerfile="\${incdir}/\${header}" + fi + ;; + esac + compiler="\${compiler} \${1}" + shift +done + +if test "x\${headerfile}" = "x" ; then + echo "error: can't find header \${header} in include paths" >2 +else + if test -f \${outfile} ; then + rm -f \${outfile} + else + mkdir -p \`dirname \${outfile}\` + fi + depsfile=".deps/\`basename \${outfile}\`.d" + mkdir -p .deps + # can do this because gcc is >= 3.4: + \${compiler} -o \${outfile} -MMD -MF "\${depsfile}" "\${headerfile}" + exit \${?} +fi +EOF + chmod +x bk-make-pch + fi + fi + fi + + AC_SUBST(GCC_PCH) +]) + + + dnl --------------------------------------------------------------------------- dnl AC_BAKEFILE dnl diff --git a/autoconf_inc.m4 b/autoconf_inc.m4 index 24541a4b52..b56c782e4c 100644 --- a/autoconf_inc.m4 +++ b/autoconf_inc.m4 @@ -2,509 +2,497 @@ dnl This macro was generated by dnl Bakefile 0.1.1 (http://bakefile.sourceforge.net) dnl Do not modify, all changes will be overwritten! - dnl Conditions: -dnl ### begin block COND_BUILD_DEBUG ### +dnl Conditions: + +dnl ### begin block 0_AC_BAKEFILE_PRECOMP_HEADERS ### +AC_BAKEFILE_PRECOMP_HEADERS + +dnl Conditions: + +dnl ### begin block 1_COND_BUILD_DEBUG ### COND_BUILD_DEBUG="#" if test "x$BUILD" = "xdebug" ; then COND_BUILD_DEBUG="" fi AC_SUBST(COND_BUILD_DEBUG) -dnl ### begin block COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT ### +dnl ### begin block 1_COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT ### COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT="#" if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT="" fi AC_SUBST(COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT) -dnl ### begin block COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT ### +dnl ### begin block 1_COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT ### COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT="#" if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT="" fi AC_SUBST(COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT) -dnl ### begin block COND_BUILD_RELEASE ### +dnl ### begin block 1_COND_BUILD_RELEASE ### COND_BUILD_RELEASE="#" if test "x$BUILD" = "xrelease" ; then COND_BUILD_RELEASE="" fi AC_SUBST(COND_BUILD_RELEASE) -dnl ### begin block COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT ### +dnl ### begin block 1_COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT ### COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT="#" if test "x$BUILD" = "xrelease" -a "x$DEBUG_INFO" = "xdefault" ; then COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT="" fi AC_SUBST(COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT) -dnl ### begin block COND_DEBUG_FLAG_1 ### +dnl ### begin block 1_COND_DEBUG_FLAG_1 ### COND_DEBUG_FLAG_1="#" if test "x$DEBUG_FLAG" = "x1" ; then COND_DEBUG_FLAG_1="" fi AC_SUBST(COND_DEBUG_FLAG_1) -dnl ### begin block COND_DEBUG_INFO_0 ### +dnl ### begin block 1_COND_DEBUG_INFO_0 ### COND_DEBUG_INFO_0="#" if test "x$DEBUG_INFO" = "x0" ; then COND_DEBUG_INFO_0="" fi AC_SUBST(COND_DEBUG_INFO_0) -dnl ### begin block COND_DEBUG_INFO_1 ### +dnl ### begin block 1_COND_DEBUG_INFO_1 ### COND_DEBUG_INFO_1="#" if test "x$DEBUG_INFO" = "x1" ; then COND_DEBUG_INFO_1="" fi AC_SUBST(COND_DEBUG_INFO_1) -dnl ### begin block COND_DEPS_TRACKING_0 ### +dnl ### begin block 1_COND_DEPS_TRACKING_0 ### COND_DEPS_TRACKING_0="#" if test "x$DEPS_TRACKING" = "x0" ; then COND_DEPS_TRACKING_0="" fi AC_SUBST(COND_DEPS_TRACKING_0) -dnl ### begin block COND_DEPS_TRACKING_1 ### +dnl ### begin block 1_COND_DEPS_TRACKING_1 ### COND_DEPS_TRACKING_1="#" if test "x$DEPS_TRACKING" = "x1" ; then COND_DEPS_TRACKING_1="" fi AC_SUBST(COND_DEPS_TRACKING_1) -dnl ### begin block COND_MONOLITHIC_0 ### +dnl ### begin block 1_COND_GCC_PCH_1 ### + COND_GCC_PCH_1="#" + if test "x$GCC_PCH" = "x1" ; then + COND_GCC_PCH_1="" + fi + AC_SUBST(COND_GCC_PCH_1) +dnl ### begin block 1_COND_MONOLITHIC_0 ### COND_MONOLITHIC_0="#" if test "x$MONOLITHIC" = "x0" ; then COND_MONOLITHIC_0="" fi AC_SUBST(COND_MONOLITHIC_0) -dnl ### begin block COND_MONOLITHIC_0_SHARED_0 ### +dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_0 ### COND_MONOLITHIC_0_SHARED_0="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" ; then COND_MONOLITHIC_0_SHARED_0="" fi AC_SUBST(COND_MONOLITHIC_0_SHARED_0) -dnl ### begin block COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 ### +dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 ### COND_MONOLITHIC_0_SHARED_0_USE_GUI_1="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" ; then COND_MONOLITHIC_0_SHARED_0_USE_GUI_1="" fi AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1) -dnl ### begin block COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 ### +dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 ### COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1="" fi AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1) -dnl ### begin block COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 ### +dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 ### COND_MONOLITHIC_0_SHARED_0_USE_HTML_1="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_HTML" = "x1" ; then COND_MONOLITHIC_0_SHARED_0_USE_HTML_1="" fi AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_HTML_1) -dnl ### begin block COND_MONOLITHIC_0_SHARED_1 ### +dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_1 ### COND_MONOLITHIC_0_SHARED_1="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" ; then COND_MONOLITHIC_0_SHARED_1="" fi AC_SUBST(COND_MONOLITHIC_0_SHARED_1) -dnl ### begin block COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 ### +dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 ### COND_MONOLITHIC_0_SHARED_1_USE_GUI_1="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" ; then COND_MONOLITHIC_0_SHARED_1_USE_GUI_1="" fi AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1) -dnl ### begin block COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 ### +dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 ### COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1="" fi AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1) -dnl ### begin block COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 ### +dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 ### COND_MONOLITHIC_0_SHARED_1_USE_HTML_1="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_HTML" = "x1" ; then COND_MONOLITHIC_0_SHARED_1_USE_HTML_1="" fi AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_HTML_1) -dnl ### begin block COND_MONOLITHIC_1 ### +dnl ### begin block 1_COND_MONOLITHIC_1 ### COND_MONOLITHIC_1="#" if test "x$MONOLITHIC" = "x1" ; then COND_MONOLITHIC_1="" fi AC_SUBST(COND_MONOLITHIC_1) -dnl ### begin block COND_MONOLITHIC_1_SHARED_0 ### +dnl ### begin block 1_COND_MONOLITHIC_1_SHARED_0 ### COND_MONOLITHIC_1_SHARED_0="#" if test "x$MONOLITHIC" = "x1" -a "x$SHARED" = "x0" ; then COND_MONOLITHIC_1_SHARED_0="" fi AC_SUBST(COND_MONOLITHIC_1_SHARED_0) -dnl ### begin block COND_MONOLITHIC_1_SHARED_1 ### +dnl ### begin block 1_COND_MONOLITHIC_1_SHARED_1 ### COND_MONOLITHIC_1_SHARED_1="#" if test "x$MONOLITHIC" = "x1" -a "x$SHARED" = "x1" ; then COND_MONOLITHIC_1_SHARED_1="" fi AC_SUBST(COND_MONOLITHIC_1_SHARED_1) -dnl ### begin block COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 ### +dnl ### begin block 1_COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 ### COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="#" if test "x$OFFICIAL_BUILD" = "x0" -a "x$PLATFORM_WIN32" = "x1" ; then COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="" fi AC_SUBST(COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1) -dnl ### begin block COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 ### +dnl ### begin block 1_COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 ### COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1="#" if test "x$OFFICIAL_BUILD" = "x1" -a "x$PLATFORM_WIN32" = "x1" ; then COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1="" fi AC_SUBST(COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1) -dnl ### begin block COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 ### +dnl ### begin block 1_COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 ### COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="#" if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERSION" = "x1" ; then COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="" fi AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERSION_1) -dnl ### begin block COND_PLATFORM_MACOSX_1 ### +dnl ### begin block 1_COND_PLATFORM_MACOSX_1 ### COND_PLATFORM_MACOSX_1="#" if test "x$PLATFORM_MACOSX" = "x1" ; then COND_PLATFORM_MACOSX_1="" fi AC_SUBST(COND_PLATFORM_MACOSX_1) -dnl ### begin block COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA ### +dnl ### begin block 1_COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA ### COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="#" if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xCOCOA" ; then COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="" fi AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA) -dnl ### begin block COND_PLATFORM_MACOSX_1_TOOLKIT_GTK ### +dnl ### begin block 1_COND_PLATFORM_MACOSX_1_TOOLKIT_GTK ### COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="#" if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" ; then COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="" fi AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_GTK) -dnl ### begin block COND_PLATFORM_MACOSX_1_TOOLKIT_MAC ### +dnl ### begin block 1_COND_PLATFORM_MACOSX_1_TOOLKIT_MAC ### COND_PLATFORM_MACOSX_1_TOOLKIT_MAC="#" if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" ; then COND_PLATFORM_MACOSX_1_TOOLKIT_MAC="" fi AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_MAC) -dnl ### begin block COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 ### +dnl ### begin block 1_COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 ### COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#" if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="" fi AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1) -dnl ### begin block COND_PLATFORM_UNIX_0 ### +dnl ### begin block 1_COND_PLATFORM_MAC_1 ### + COND_PLATFORM_MAC_1="#" + if test "x$PLATFORM_MAC" = "x1" ; then + COND_PLATFORM_MAC_1="" + fi + AC_SUBST(COND_PLATFORM_MAC_1) +dnl ### begin block 1_COND_PLATFORM_UNIX_0 ### COND_PLATFORM_UNIX_0="#" if test "x$PLATFORM_UNIX" = "x0" ; then COND_PLATFORM_UNIX_0="" fi AC_SUBST(COND_PLATFORM_UNIX_0) -dnl ### begin block COND_PLATFORM_UNIX_1 ### +dnl ### begin block 1_COND_PLATFORM_UNIX_1 ### COND_PLATFORM_UNIX_1="#" if test "x$PLATFORM_UNIX" = "x1" ; then COND_PLATFORM_UNIX_1="" fi AC_SUBST(COND_PLATFORM_UNIX_1) -dnl ### begin block COND_PLATFORM_WIN32_0 ### +dnl ### begin block 1_COND_PLATFORM_WIN32_0 ### COND_PLATFORM_WIN32_0="#" if test "x$PLATFORM_WIN32" = "x0" ; then COND_PLATFORM_WIN32_0="" fi AC_SUBST(COND_PLATFORM_WIN32_0) -dnl ### begin block COND_PLATFORM_WIN32_1 ### +dnl ### begin block 1_COND_PLATFORM_WIN32_1 ### COND_PLATFORM_WIN32_1="#" if test "x$PLATFORM_WIN32" = "x1" ; then COND_PLATFORM_WIN32_1="" fi AC_SUBST(COND_PLATFORM_WIN32_1) -dnl ### begin block COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 ### +dnl ### begin block 1_COND_SHARED_0 ### + COND_SHARED_0="#" + if test "x$SHARED" = "x0" ; then + COND_SHARED_0="" + fi + AC_SUBST(COND_SHARED_0) +dnl ### begin block 1_COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 ### COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#" if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="" fi AC_SUBST(COND_SHARED_0_USE_GUI_1_USE_OPENGL_1) -dnl ### begin block COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 ### +dnl ### begin block 1_COND_SHARED_1 ### + COND_SHARED_1="#" + if test "x$SHARED" = "x1" ; then + COND_SHARED_1="" + fi + AC_SUBST(COND_SHARED_1) +dnl ### begin block 1_COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 ### COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="#" if test "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="" fi AC_SUBST(COND_SHARED_1_USE_GUI_1_USE_OPENGL_1) -dnl ### begin block COND_TOOLKIT_COCOA ### +dnl ### begin block 1_COND_TOOLKIT_COCOA ### COND_TOOLKIT_COCOA="#" if test "x$TOOLKIT" = "xCOCOA" ; then COND_TOOLKIT_COCOA="" fi AC_SUBST(COND_TOOLKIT_COCOA) -dnl ### begin block COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 ### +dnl ### begin block 1_COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 ### COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0="#" if test "x$TOOLKIT" = "xCOCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0="" fi AC_SUBST(COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0) -dnl ### begin block COND_TOOLKIT_GTK ### +dnl ### begin block 1_COND_TOOLKIT_GTK ### COND_TOOLKIT_GTK="#" if test "x$TOOLKIT" = "xGTK" ; then COND_TOOLKIT_GTK="" fi AC_SUBST(COND_TOOLKIT_GTK) -dnl ### begin block COND_TOOLKIT_GTK_USE_GUI_1 ### +dnl ### begin block 1_COND_TOOLKIT_GTK_USE_GUI_1 ### COND_TOOLKIT_GTK_USE_GUI_1="#" if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" ; then COND_TOOLKIT_GTK_USE_GUI_1="" fi AC_SUBST(COND_TOOLKIT_GTK_USE_GUI_1) -dnl ### begin block COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 ### +dnl ### begin block 1_COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 ### COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0="#" if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0="" fi AC_SUBST(COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0) -dnl ### begin block COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1 ### - COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1="#" - if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then - COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1="" - fi - AC_SUBST(COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1) -dnl ### begin block COND_TOOLKIT_MAC ### +dnl ### begin block 1_COND_TOOLKIT_MAC ### COND_TOOLKIT_MAC="#" if test "x$TOOLKIT" = "xMAC" ; then COND_TOOLKIT_MAC="" fi AC_SUBST(COND_TOOLKIT_MAC) -dnl ### begin block COND_TOOLKIT_MAC_USE_GUI_1 ### +dnl ### begin block 1_COND_TOOLKIT_MAC_USE_GUI_1 ### COND_TOOLKIT_MAC_USE_GUI_1="#" if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" ; then COND_TOOLKIT_MAC_USE_GUI_1="" fi AC_SUBST(COND_TOOLKIT_MAC_USE_GUI_1) -dnl ### begin block COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 ### +dnl ### begin block 1_COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 ### COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="#" if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="" fi AC_SUBST(COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0) -dnl ### begin block COND_TOOLKIT_MGL ### +dnl ### begin block 1_COND_TOOLKIT_MGL ### COND_TOOLKIT_MGL="#" if test "x$TOOLKIT" = "xMGL" ; then COND_TOOLKIT_MGL="" fi AC_SUBST(COND_TOOLKIT_MGL) -dnl ### begin block COND_TOOLKIT_MGL_USE_GUI_1 ### +dnl ### begin block 1_COND_TOOLKIT_MGL_USE_GUI_1 ### COND_TOOLKIT_MGL_USE_GUI_1="#" if test "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" ; then COND_TOOLKIT_MGL_USE_GUI_1="" fi AC_SUBST(COND_TOOLKIT_MGL_USE_GUI_1) -dnl ### begin block COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1 ### - COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1="#" - if test "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then - COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1="" - fi - AC_SUBST(COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1) -dnl ### begin block COND_TOOLKIT_MOTIF ### +dnl ### begin block 1_COND_TOOLKIT_MOTIF ### COND_TOOLKIT_MOTIF="#" if test "x$TOOLKIT" = "xMOTIF" ; then COND_TOOLKIT_MOTIF="" fi AC_SUBST(COND_TOOLKIT_MOTIF) -dnl ### begin block COND_TOOLKIT_MOTIF_USE_GUI_1 ### +dnl ### begin block 1_COND_TOOLKIT_MOTIF_USE_GUI_1 ### COND_TOOLKIT_MOTIF_USE_GUI_1="#" if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" ; then COND_TOOLKIT_MOTIF_USE_GUI_1="" fi AC_SUBST(COND_TOOLKIT_MOTIF_USE_GUI_1) -dnl ### begin block COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 ### +dnl ### begin block 1_COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 ### COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0="#" if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0="" fi AC_SUBST(COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0) -dnl ### begin block COND_TOOLKIT_MSW ### +dnl ### begin block 1_COND_TOOLKIT_MSW ### COND_TOOLKIT_MSW="#" if test "x$TOOLKIT" = "xMSW" ; then COND_TOOLKIT_MSW="" fi AC_SUBST(COND_TOOLKIT_MSW) -dnl ### begin block COND_TOOLKIT_MSW_USE_GUI_1 ### +dnl ### begin block 1_COND_TOOLKIT_MSW_USE_GUI_1 ### COND_TOOLKIT_MSW_USE_GUI_1="#" if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" ; then COND_TOOLKIT_MSW_USE_GUI_1="" fi AC_SUBST(COND_TOOLKIT_MSW_USE_GUI_1) -dnl ### begin block COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 ### +dnl ### begin block 1_COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 ### COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0="#" if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0="" fi AC_SUBST(COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0) -dnl ### begin block COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1 ### - COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1="#" - if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then - COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1="" - fi - AC_SUBST(COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1) -dnl ### begin block COND_TOOLKIT_OS2 ### +dnl ### begin block 1_COND_TOOLKIT_OS2 ### COND_TOOLKIT_OS2="#" if test "x$TOOLKIT" = "xOS2" ; then COND_TOOLKIT_OS2="" fi AC_SUBST(COND_TOOLKIT_OS2) -dnl ### begin block COND_TOOLKIT_OS2_USE_GUI_1 ### +dnl ### begin block 1_COND_TOOLKIT_OS2_USE_GUI_1 ### COND_TOOLKIT_OS2_USE_GUI_1="#" if test "x$TOOLKIT" = "xOS2" -a "x$USE_GUI" = "x1" ; then COND_TOOLKIT_OS2_USE_GUI_1="" fi AC_SUBST(COND_TOOLKIT_OS2_USE_GUI_1) -dnl ### begin block COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 ### +dnl ### begin block 1_COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 ### COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0="#" if test "x$TOOLKIT" = "xOS2" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0="" fi AC_SUBST(COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0) -dnl ### begin block COND_TOOLKIT_X11 ### +dnl ### begin block 1_COND_TOOLKIT_X11 ### COND_TOOLKIT_X11="#" if test "x$TOOLKIT" = "xX11" ; then COND_TOOLKIT_X11="" fi AC_SUBST(COND_TOOLKIT_X11) -dnl ### begin block COND_TOOLKIT_X11_USE_GUI_1 ### +dnl ### begin block 1_COND_TOOLKIT_X11_USE_GUI_1 ### COND_TOOLKIT_X11_USE_GUI_1="#" if test "x$TOOLKIT" = "xX11" -a "x$USE_GUI" = "x1" ; then COND_TOOLKIT_X11_USE_GUI_1="" fi AC_SUBST(COND_TOOLKIT_X11_USE_GUI_1) -dnl ### begin block COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 ### - COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1="#" - if test "x$TOOLKIT" = "xX11" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then - COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1="" - fi - AC_SUBST(COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1) -dnl ### begin block COND_UNICODE_1 ### +dnl ### begin block 1_COND_UNICODE_1 ### COND_UNICODE_1="#" if test "x$UNICODE" = "x1" ; then COND_UNICODE_1="" fi AC_SUBST(COND_UNICODE_1) -dnl ### begin block COND_USE_GUI_0 ### +dnl ### begin block 1_COND_USE_GUI_0 ### COND_USE_GUI_0="#" if test "x$USE_GUI" = "x0" ; then COND_USE_GUI_0="" fi AC_SUBST(COND_USE_GUI_0) -dnl ### begin block COND_USE_GUI_1 ### +dnl ### begin block 1_COND_USE_GUI_1 ### COND_USE_GUI_1="#" if test "x$USE_GUI" = "x1" ; then COND_USE_GUI_1="" fi AC_SUBST(COND_USE_GUI_1) -dnl ### begin block COND_USE_GUI_1_WXUNIV_0 ### +dnl ### begin block 1_COND_USE_GUI_1_WXUNIV_0 ### COND_USE_GUI_1_WXUNIV_0="#" if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then COND_USE_GUI_1_WXUNIV_0="" fi AC_SUBST(COND_USE_GUI_1_WXUNIV_0) -dnl ### begin block COND_USE_GUI_1_WXUNIV_1 ### +dnl ### begin block 1_COND_USE_GUI_1_WXUNIV_1 ### COND_USE_GUI_1_WXUNIV_1="#" if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then COND_USE_GUI_1_WXUNIV_1="" fi AC_SUBST(COND_USE_GUI_1_WXUNIV_1) -dnl ### begin block COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN ### +dnl ### begin block 1_COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN ### COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#" if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="" fi AC_SUBST(COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN) -dnl ### begin block COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN ### +dnl ### begin block 1_COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN ### COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#" if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="" fi AC_SUBST(COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN) -dnl ### begin block COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN ### +dnl ### begin block 1_COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN ### COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#" if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="" fi AC_SUBST(COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN) -dnl ### begin block COND_USE_SOSYMLINKS_1 ### +dnl ### begin block 1_COND_USE_SOSYMLINKS_1 ### COND_USE_SOSYMLINKS_1="#" if test "x$USE_SOSYMLINKS" = "x1" ; then COND_USE_SOSYMLINKS_1="" fi AC_SUBST(COND_USE_SOSYMLINKS_1) -dnl ### begin block COND_USE_SOVERLINUX_1 ### +dnl ### begin block 1_COND_USE_SOVERLINUX_1 ### COND_USE_SOVERLINUX_1="#" if test "x$USE_SOVERLINUX" = "x1" ; then COND_USE_SOVERLINUX_1="" fi AC_SUBST(COND_USE_SOVERLINUX_1) -dnl ### begin block COND_USE_SOVERSION_0 ### +dnl ### begin block 1_COND_USE_SOVERSION_0 ### COND_USE_SOVERSION_0="#" if test "x$USE_SOVERSION" = "x0" ; then COND_USE_SOVERSION_0="" fi AC_SUBST(COND_USE_SOVERSION_0) -dnl ### begin block COND_USE_SOVERSOLARIS_1 ### +dnl ### begin block 1_COND_USE_SOVERSOLARIS_1 ### COND_USE_SOVERSOLARIS_1="#" if test "x$USE_SOVERSOLARIS" = "x1" ; then COND_USE_SOVERSOLARIS_1="" fi AC_SUBST(COND_USE_SOVERSOLARIS_1) -dnl ### begin block COND_WXUNIV_1 ### +dnl ### begin block 1_COND_WXUNIV_1 ### COND_WXUNIV_1="#" if test "x$WXUNIV" = "x1" ; then COND_WXUNIV_1="" fi AC_SUBST(COND_WXUNIV_1) -dnl ### begin block COND_WXUSE_EXPAT_BUILTIN ### +dnl ### begin block 1_COND_WXUSE_EXPAT_BUILTIN ### COND_WXUSE_EXPAT_BUILTIN="#" if test "x$wxUSE_EXPAT" = "xbuiltin" ; then COND_WXUSE_EXPAT_BUILTIN="" fi AC_SUBST(COND_WXUSE_EXPAT_BUILTIN) -dnl ### begin block COND_WXUSE_LIBJPEG_BUILTIN ### +dnl ### begin block 1_COND_WXUSE_LIBJPEG_BUILTIN ### COND_WXUSE_LIBJPEG_BUILTIN="#" if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then COND_WXUSE_LIBJPEG_BUILTIN="" fi AC_SUBST(COND_WXUSE_LIBJPEG_BUILTIN) -dnl ### begin block COND_WXUSE_LIBPNG_BUILTIN ### +dnl ### begin block 1_COND_WXUSE_LIBPNG_BUILTIN ### COND_WXUSE_LIBPNG_BUILTIN="#" if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then COND_WXUSE_LIBPNG_BUILTIN="" fi AC_SUBST(COND_WXUSE_LIBPNG_BUILTIN) -dnl ### begin block COND_WXUSE_LIBTIFF_BUILTIN ### +dnl ### begin block 1_COND_WXUSE_LIBTIFF_BUILTIN ### COND_WXUSE_LIBTIFF_BUILTIN="#" if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then COND_WXUSE_LIBTIFF_BUILTIN="" fi AC_SUBST(COND_WXUSE_LIBTIFF_BUILTIN) -dnl ### begin block COND_WXUSE_ODBC_BUILTIN ### +dnl ### begin block 1_COND_WXUSE_ODBC_BUILTIN ### COND_WXUSE_ODBC_BUILTIN="#" if test "x$wxUSE_ODBC" = "xbuiltin" ; then COND_WXUSE_ODBC_BUILTIN="" fi AC_SUBST(COND_WXUSE_ODBC_BUILTIN) -dnl ### begin block COND_WXUSE_REGEX_BUILTIN ### +dnl ### begin block 1_COND_WXUSE_REGEX_BUILTIN ### COND_WXUSE_REGEX_BUILTIN="#" if test "x$wxUSE_REGEX" = "xbuiltin" ; then COND_WXUSE_REGEX_BUILTIN="" fi AC_SUBST(COND_WXUSE_REGEX_BUILTIN) -dnl ### begin block COND_WXUSE_ZLIB_BUILTIN ### +dnl ### begin block 1_COND_WXUSE_ZLIB_BUILTIN ### COND_WXUSE_ZLIB_BUILTIN="#" if test "x$wxUSE_ZLIB" = "xbuiltin" ; then COND_WXUSE_ZLIB_BUILTIN="" fi AC_SUBST(COND_WXUSE_ZLIB_BUILTIN) -dnl ### begin block COND_PLATFORM_MAC_1 ### - COND_PLATFORM_MAC_1="#" - if test "x$PLATFORM_MAC" = "x1" ; then - COND_PLATFORM_MAC_1="" - fi - AC_SUBST(COND_PLATFORM_MAC_1) -dnl ### begin block COND_SHARED_1 ### - COND_SHARED_1="#" - if test "x$SHARED" = "x1" ; then - COND_SHARED_1="" - fi - AC_SUBST(COND_SHARED_1) -dnl ### begin block COND_SHARED_0 ### - COND_SHARED_0="#" - if test "x$SHARED" = "x0" ; then - COND_SHARED_0="" - fi - AC_SUBST(COND_SHARED_0) diff --git a/configure b/configure index 499c4209b8..eeec640762 100755 --- a/configure +++ b/configure @@ -312,7 +312,7 @@ ac_includes_default="\ #endif" ac_subdirs_all="$ac_subdirs_all src/expat" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV EXTRALIBS_ESD CORE_BASE_LIBS CORE_GUI_LIBS wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS EXTRALIBS_XML EXTRALIBS_ODBC EXTRALIBS_GUI EXTRALIBS_OPENGL UNICODE BUILD DEBUG_INFO DEBUG_FLAG SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG HOST_SUFFIX SET_MAKE MAKE_SET INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX SO_SUFFIX_MODULE DLLPREFIX DLLPREFIX_MODULE AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING COND_BUILD_DEBUG COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT COND_BUILD_RELEASE COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT COND_DEBUG_FLAG_1 COND_DEBUG_INFO_0 COND_DEBUG_INFO_1 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_UNIX_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1 COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_OS2 COND_TOOLKIT_OS2_USE_GUI_1 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_UNICODE_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WXUNIV_1 COND_WXUSE_EXPAT_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN COND_PLATFORM_MAC_1 COND_SHARED_1 COND_SHARED_0 LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_EXTRALIBS WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WX_LARGEFILE_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS NM LD MAKEINFO INSTALL_LIBRARY LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV EXTRALIBS_ESD CORE_BASE_LIBS CORE_GUI_LIBS wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS EXTRALIBS_XML EXTRALIBS_ODBC EXTRALIBS_GUI EXTRALIBS_OPENGL UNICODE BUILD DEBUG_INFO DEBUG_FLAG SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG HOST_SUFFIX SET_MAKE MAKE_SET INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX SO_SUFFIX_MODULE DLLPREFIX DLLPREFIX_MODULE AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING GCC_PCH COND_BUILD_DEBUG COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT COND_BUILD_RELEASE COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT COND_DEBUG_FLAG_1 COND_DEBUG_INFO_0 COND_DEBUG_INFO_1 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_GCC_PCH_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MAC_1 COND_PLATFORM_UNIX_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1 COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_OS2 COND_TOOLKIT_OS2_USE_GUI_1 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_UNICODE_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WXUNIV_1 COND_WXUSE_EXPAT_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_EXTRALIBS WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WX_LARGEFILE_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS NM LD MAKEINFO INSTALL_LIBRARY LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1029,6 +1029,7 @@ Optional Features: --disable-largefile omit support for large files --disable-gtktest do not try to compile and run a test GTK+ program --disable-gtktest Do not try to compile and run a test GTK program + --disable-precomp-headers don't use precompiled headers even if compiler can Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -34676,8 +34677,8 @@ echo "${ECHO_T}none" >&6 cat <bk-deps #!/bin/sh -# This script is part of Bakefile (http://bakefile.sf.net) autoconf script. -# It is used to track C/C++ files dependencies in portable way. +# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf +# script. It is used to track C/C++ files dependencies in portable way. # # Permission is given to use this file in any way. @@ -34861,6 +34862,123 @@ fi + + + + # Check whether --enable-precomp-headers or --disable-precomp-headers was given. +if test "${enable_precomp_headers+set}" = set; then + enableval="$enable_precomp_headers" + bk_use_pch="$enableval" +fi; + + GCC_PCH=0 + + if test "x$bk_use_pch" = "x" -o "x$bk_use_pch" = "xyes" ; then + if test "x$GCC" = "xyes"; then + echo "$as_me:$LINENO: checking if the compiler supports precompiled headers" >&5 +echo $ECHO_N "checking if the compiler supports precompiled headers... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + #if !defined(__GNUC__) || !defined(__GNUC_MINOR__) || \ + (__GNUC__ < 3) || (__GNUC__ == 3 && __GNUC_MINOR__ < 4) + #error "no pch support" + #endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + CPPFLAGS="-fpch-deps $CPPFLAGS" + GCC_PCH=1 + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + +fi +rm -f conftest.$ac_objext conftest.$ac_ext + if test $GCC_PCH = 1 ; then + cat <bk-make-pch +#!/bin/sh + +# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf +# script. It is used to generated precompiled headers. +# +# Permission is given to use this file in any way. + +outfile="\${1}" +header="\${2}" +shift +shift + +compiler= +headerfile= +while test \${#} -gt 0; do + case "\${1}" in + -I* ) + incdir=\`echo \${1} | sed -e 's/-I\(.*\)/\1/g'\` + if test "x\${headerfile}" = "x" -a -f "\${incdir}/\${header}" ; then + headerfile="\${incdir}/\${header}" + fi + ;; + esac + compiler="\${compiler} \${1}" + shift +done + +if test "x\${headerfile}" = "x" ; then + echo "error: can't find header \${header} in include paths" >2 +else + if test -f \${outfile} ; then + rm -f \${outfile} + else + mkdir -p \`dirname \${outfile}\` + fi + depsfile=".deps/\`basename \${outfile}\`.d" + mkdir -p .deps + # can do this because gcc is >= 3.4: + \${compiler} -o \${outfile} -MMD -MF "\${depsfile}" "\${headerfile}" + exit \${?} +fi +EOF + chmod +x bk-make-pch + fi + fi + fi + + + + + COND_BUILD_DEBUG="#" if test "x$BUILD" = "xdebug" ; then COND_BUILD_DEBUG="" @@ -34911,6 +35029,11 @@ fi COND_DEPS_TRACKING_1="" fi + COND_GCC_PCH_1="#" + if test "x$GCC_PCH" = "x1" ; then + COND_GCC_PCH_1="" + fi + COND_MONOLITHIC_0="#" if test "x$MONOLITHIC" = "x0" ; then COND_MONOLITHIC_0="" @@ -35011,6 +35134,11 @@ fi COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="" fi + COND_PLATFORM_MAC_1="#" + if test "x$PLATFORM_MAC" = "x1" ; then + COND_PLATFORM_MAC_1="" + fi + COND_PLATFORM_UNIX_0="#" if test "x$PLATFORM_UNIX" = "x0" ; then COND_PLATFORM_UNIX_0="" @@ -35031,11 +35159,21 @@ fi COND_PLATFORM_WIN32_1="" fi + COND_SHARED_0="#" + if test "x$SHARED" = "x0" ; then + COND_SHARED_0="" + fi + COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#" if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="" fi + COND_SHARED_1="#" + if test "x$SHARED" = "x1" ; then + COND_SHARED_1="" + fi + COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="#" if test "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="" @@ -35066,11 +35204,6 @@ fi COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0="" fi - COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1="#" - if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then - COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1="" - fi - COND_TOOLKIT_MAC="#" if test "x$TOOLKIT" = "xMAC" ; then COND_TOOLKIT_MAC="" @@ -35096,11 +35229,6 @@ fi COND_TOOLKIT_MGL_USE_GUI_1="" fi - COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1="#" - if test "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then - COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1="" - fi - COND_TOOLKIT_MOTIF="#" if test "x$TOOLKIT" = "xMOTIF" ; then COND_TOOLKIT_MOTIF="" @@ -35131,11 +35259,6 @@ fi COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0="" fi - COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1="#" - if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then - COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1="" - fi - COND_TOOLKIT_OS2="#" if test "x$TOOLKIT" = "xOS2" ; then COND_TOOLKIT_OS2="" @@ -35161,11 +35284,6 @@ fi COND_TOOLKIT_X11_USE_GUI_1="" fi - COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1="#" - if test "x$TOOLKIT" = "xX11" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then - COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1="" - fi - COND_UNICODE_1="#" if test "x$UNICODE" = "x1" ; then COND_UNICODE_1="" @@ -35266,24 +35384,21 @@ fi COND_WXUSE_ZLIB_BUILTIN="" fi - COND_PLATFORM_MAC_1="#" - if test "x$PLATFORM_MAC" = "x1" ; then - COND_PLATFORM_MAC_1="" - fi - - COND_SHARED_1="#" - if test "x$SHARED" = "x1" ; then - COND_SHARED_1="" - fi - - COND_SHARED_0="#" - if test "x$SHARED" = "x0" ; then - COND_SHARED_0="" - fi +if test $GCC_PCH = 1 ; then + CPPFLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA $CPPFLAGS" +else + case "${host}" in + powerpc-*-darwin* ) + CPPFLAGS="-DNO_GCC_PRAGMA $CPPFLAGS" + ;; + *) + ;; + esac +fi SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`" @@ -36205,6 +36320,7 @@ s,@USE_MACVERSION@,$USE_MACVERSION,;t t s,@USE_SOSYMLINKS@,$USE_SOSYMLINKS,;t t s,@SONAME_FLAG@,$SONAME_FLAG,;t t s,@DEPS_TRACKING@,$DEPS_TRACKING,;t t +s,@GCC_PCH@,$GCC_PCH,;t t s,@COND_BUILD_DEBUG@,$COND_BUILD_DEBUG,;t t s,@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@,$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT,;t t s,@COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT@,$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT,;t t @@ -36215,6 +36331,7 @@ s,@COND_DEBUG_INFO_0@,$COND_DEBUG_INFO_0,;t t s,@COND_DEBUG_INFO_1@,$COND_DEBUG_INFO_1,;t t s,@COND_DEPS_TRACKING_0@,$COND_DEPS_TRACKING_0,;t t s,@COND_DEPS_TRACKING_1@,$COND_DEPS_TRACKING_1,;t t +s,@COND_GCC_PCH_1@,$COND_GCC_PCH_1,;t t s,@COND_MONOLITHIC_0@,$COND_MONOLITHIC_0,;t t s,@COND_MONOLITHIC_0_SHARED_0@,$COND_MONOLITHIC_0_SHARED_0,;t t s,@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@,$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1,;t t @@ -36235,37 +36352,36 @@ s,@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@,$COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA,; s,@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@,$COND_PLATFORM_MACOSX_1_TOOLKIT_GTK,;t t s,@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@,$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC,;t t s,@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@,$COND_PLATFORM_MACOSX_1_USE_SOVERSION_1,;t t +s,@COND_PLATFORM_MAC_1@,$COND_PLATFORM_MAC_1,;t t s,@COND_PLATFORM_UNIX_0@,$COND_PLATFORM_UNIX_0,;t t s,@COND_PLATFORM_UNIX_1@,$COND_PLATFORM_UNIX_1,;t t s,@COND_PLATFORM_WIN32_0@,$COND_PLATFORM_WIN32_0,;t t s,@COND_PLATFORM_WIN32_1@,$COND_PLATFORM_WIN32_1,;t t +s,@COND_SHARED_0@,$COND_SHARED_0,;t t s,@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@,$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1,;t t +s,@COND_SHARED_1@,$COND_SHARED_1,;t t s,@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@,$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1,;t t s,@COND_TOOLKIT_COCOA@,$COND_TOOLKIT_COCOA,;t t s,@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0,;t t s,@COND_TOOLKIT_GTK@,$COND_TOOLKIT_GTK,;t t s,@COND_TOOLKIT_GTK_USE_GUI_1@,$COND_TOOLKIT_GTK_USE_GUI_1,;t t s,@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0,;t t -s,@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1,;t t s,@COND_TOOLKIT_MAC@,$COND_TOOLKIT_MAC,;t t s,@COND_TOOLKIT_MAC_USE_GUI_1@,$COND_TOOLKIT_MAC_USE_GUI_1,;t t s,@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0,;t t s,@COND_TOOLKIT_MGL@,$COND_TOOLKIT_MGL,;t t s,@COND_TOOLKIT_MGL_USE_GUI_1@,$COND_TOOLKIT_MGL_USE_GUI_1,;t t -s,@COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1,;t t s,@COND_TOOLKIT_MOTIF@,$COND_TOOLKIT_MOTIF,;t t s,@COND_TOOLKIT_MOTIF_USE_GUI_1@,$COND_TOOLKIT_MOTIF_USE_GUI_1,;t t s,@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0,;t t s,@COND_TOOLKIT_MSW@,$COND_TOOLKIT_MSW,;t t s,@COND_TOOLKIT_MSW_USE_GUI_1@,$COND_TOOLKIT_MSW_USE_GUI_1,;t t s,@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0,;t t -s,@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1,;t t s,@COND_TOOLKIT_OS2@,$COND_TOOLKIT_OS2,;t t s,@COND_TOOLKIT_OS2_USE_GUI_1@,$COND_TOOLKIT_OS2_USE_GUI_1,;t t s,@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0,;t t s,@COND_TOOLKIT_X11@,$COND_TOOLKIT_X11,;t t s,@COND_TOOLKIT_X11_USE_GUI_1@,$COND_TOOLKIT_X11_USE_GUI_1,;t t -s,@COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1,;t t s,@COND_UNICODE_1@,$COND_UNICODE_1,;t t s,@COND_USE_GUI_0@,$COND_USE_GUI_0,;t t s,@COND_USE_GUI_1@,$COND_USE_GUI_1,;t t @@ -36286,9 +36402,6 @@ s,@COND_WXUSE_LIBTIFF_BUILTIN@,$COND_WXUSE_LIBTIFF_BUILTIN,;t t s,@COND_WXUSE_ODBC_BUILTIN@,$COND_WXUSE_ODBC_BUILTIN,;t t s,@COND_WXUSE_REGEX_BUILTIN@,$COND_WXUSE_REGEX_BUILTIN,;t t s,@COND_WXUSE_ZLIB_BUILTIN@,$COND_WXUSE_ZLIB_BUILTIN,;t t -s,@COND_PLATFORM_MAC_1@,$COND_PLATFORM_MAC_1,;t t -s,@COND_SHARED_1@,$COND_SHARED_1,;t t -s,@COND_SHARED_0@,$COND_SHARED_0,;t t s,@LEX_STEM@,$LEX_STEM,;t t s,@PATH_IFS@,$PATH_IFS,;t t s,@WX_MAJOR_VERSION_NUMBER@,$WX_MAJOR_VERSION_NUMBER,;t t diff --git a/configure.in b/configure.in index cbed6ad442..ae9be08ae7 100644 --- a/configure.in +++ b/configure.in @@ -5634,6 +5634,21 @@ AC_SUBST(HOST_SUFFIX) AC_BAKEFILE +dnl Find out if we have to define NO_GCC_PRAGMA and WX_PRECOMP: +if test $GCC_PCH = 1 ; then + CPPFLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA $CPPFLAGS" +else + case "${host}" in + powerpc-*-darwin* ) + dnl Some Apple's GCC version are broken and can't handle the + dnl pragmas: + CPPFLAGS="-DNO_GCC_PRAGMA $CPPFLAGS" + ;; + *) + ;; + esac +fi + dnl for convenience, sort the samples in alphabetical order dnl diff --git a/contrib/src/animate/Makefile.in b/contrib/src/animate/Makefile.in index 47f0ba1fd0..bf58fe2ed7 100644 --- a/contrib/src/animate/Makefile.in +++ b/contrib/src/animate/Makefile.in @@ -41,17 +41,17 @@ top_srcdir = @top_srcdir@ ### Variables: ### -ANIMATEDLL_CXXFLAGS = $(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) \ - -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_ANIMATE $(CXXFLAGS) \ - $(PIC_FLAG) +ANIMATEDLL_CXXFLAGS = $(__animatedll_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) -I$(srcdir)/../../include -DWXUSINGDLL \ + -DWXMAKINGDLL_ANIMATE $(CXXFLAGS) $(PIC_FLAG) ANIMATEDLL_OBJECTS = \ animatedll_animate.o -ANIMATELIB_CXXFLAGS = $(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) \ - -I$(srcdir)/../../include $(CXXFLAGS) +ANIMATELIB_CXXFLAGS = $(__animatelib_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) -I$(srcdir)/../../include $(CXXFLAGS) ANIMATELIB_OBJECTS = \ animatelib_animate.o LIBDIRNAME = $(top_builddir)lib @@ -109,6 +109,9 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_GCC_PCH_1@__animatedll_PCH_DEP = \ +@COND_GCC_PCH_1@ .pch/wxprec_animatedll/wx/wxprec.h.gch +@COND_GCC_PCH_1@__animatedll_PCH_INC = -I.pch/wxprec_animatedll COND_SHARED_1___animatedll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) @COND_SHARED_1@__animatedll___depname = $(COND_SHARED_1___animatedll___depname) @@ -157,6 +160,9 @@ COND_USE_SOVERSOLARIS_1___animatedll___soname_flags = \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__animatedll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__animatedll___targetsuf3 = .$(SO_SUFFIX) +@COND_GCC_PCH_1@__animatelib_PCH_DEP = \ +@COND_GCC_PCH_1@ .pch/wxprec_animatelib/wx/wxprec.h.gch +@COND_GCC_PCH_1@__animatelib_PCH_INC = -I.pch/wxprec_animatelib COND_SHARED_0___animatelib___depname = \ $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).a @COND_SHARED_0@__animatelib___depname = $(COND_SHARED_0___animatelib___depname) @@ -167,14 +173,20 @@ COND_SHARED_0___animatelib___depname = \ all: $(__animatedll___depname) $(__animatelib___depname) -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3): $(ANIMATEDLL_OBJECTS) +@COND_GCC_PCH_1@.pch/wxprec_animatedll/wx/wxprec.h.gch: +@COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_animatedll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ANIMATEDLL_CXXFLAGS) + +@COND_GCC_PCH_1@.pch/wxprec_animatelib/wx/wxprec.h.gch: +@COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_animatelib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ANIMATELIB_CXXFLAGS) + +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3): $(__animatedll_PCH_DEP) $(ANIMATEDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(ANIMATEDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__animatedll___macinstnamecmd) $(__animatedll___importlib) $(__animatedll___soname_flags) $(__animatedll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ $(__animatedll___so_symlinks_cmd) animatedll_animate.o: $(srcdir)/animate.cpp $(CXXC) -c -o $@ $(ANIMATEDLL_CXXFLAGS) $< -@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).a: $(ANIMATELIB_OBJECTS) +@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).a: $(__animatelib_PCH_DEP) $(ANIMATELIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) rcu $@ $(ANIMATELIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ @@ -183,7 +195,7 @@ animatelib_animate.o: $(srcdir)/animate.cpp $(CXXC) -c -o $@ $(ANIMATELIB_CXXFLAGS) $< clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__animatedll___targetsuf3) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @@ -191,8 +203,7 @@ clean: rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX).a distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all $(__install_animatedll___depname) $(__install_animatelib___depname) $(INSTALL_DIR) $(includedir) diff --git a/contrib/src/deprecated/Makefile.in b/contrib/src/deprecated/Makefile.in index e7f3f030da..7403545672 100644 --- a/contrib/src/deprecated/Makefile.in +++ b/contrib/src/deprecated/Makefile.in @@ -43,16 +43,16 @@ top_srcdir = @top_srcdir@ ### Variables: ### -DEPRECATEDDLL_CFLAGS = $(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) \ - -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED $(CFLAGS) \ - $(PIC_FLAG) -DEPRECATEDDLL_CXXFLAGS = $(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) \ - -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED $(CXXFLAGS) \ - $(PIC_FLAG) +DEPRECATEDDLL_CFLAGS = $(__deprecateddll_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) -I$(srcdir)/../../include \ + -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED $(CFLAGS) $(PIC_FLAG) +DEPRECATEDDLL_CXXFLAGS = $(__deprecateddll_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) -I$(srcdir)/../../include \ + -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED $(CXXFLAGS) $(PIC_FLAG) DEPRECATEDDLL_OBJECTS = \ deprecateddll_prop.o \ deprecateddll_propform.o \ @@ -61,14 +61,16 @@ DEPRECATEDDLL_OBJECTS = \ deprecateddll_treelay.o \ deprecateddll_wxexpr.o \ deprecateddll_dosyacc.o -DEPRECATEDLIB_CFLAGS = $(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) \ - -I$(srcdir)/../../include $(CFLAGS) -DEPRECATEDLIB_CXXFLAGS = $(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) \ - -I$(srcdir)/../../include $(CXXFLAGS) +DEPRECATEDLIB_CFLAGS = $(__deprecatedlib_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) -I$(srcdir)/../../include \ + $(CFLAGS) +DEPRECATEDLIB_CXXFLAGS = $(__deprecatedlib_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) -I$(srcdir)/../../include \ + $(CXXFLAGS) DEPRECATEDLIB_OBJECTS = \ deprecatedlib_prop.o \ deprecatedlib_propform.o \ @@ -134,6 +136,9 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_GCC_PCH_1@__deprecateddll_PCH_DEP = \ +@COND_GCC_PCH_1@ .pch/wxprec_deprecateddll/wx/wxprec.h.gch +@COND_GCC_PCH_1@__deprecateddll_PCH_INC = -I.pch/wxprec_deprecateddll COND_SHARED_1___deprecateddll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) @COND_SHARED_1@__deprecateddll___depname = $(COND_SHARED_1___deprecateddll___depname) @@ -182,6 +187,9 @@ COND_USE_SOVERSOLARIS_1___deprecateddll___soname_flags = \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__deprecateddll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__deprecateddll___targetsuf3 = .$(SO_SUFFIX) +@COND_GCC_PCH_1@__deprecatedlib_PCH_DEP = \ +@COND_GCC_PCH_1@ .pch/wxprec_deprecatedlib/wx/wxprec.h.gch +@COND_GCC_PCH_1@__deprecatedlib_PCH_INC = -I.pch/wxprec_deprecatedlib COND_SHARED_0___deprecatedlib___depname = \ $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX).a @COND_SHARED_0@__deprecatedlib___depname = $(COND_SHARED_0___deprecatedlib___depname) @@ -192,15 +200,21 @@ COND_SHARED_0___deprecatedlib___depname = \ all: $(__deprecateddll___depname) $(__deprecatedlib___depname) +@COND_GCC_PCH_1@.pch/wxprec_deprecateddll/wx/wxprec.h.gch: +@COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_deprecateddll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(DEPRECATEDDLL_CXXFLAGS) + +@COND_GCC_PCH_1@.pch/wxprec_deprecatedlib/wx/wxprec.h.gch: +@COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_deprecatedlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(DEPRECATEDLIB_CXXFLAGS) + clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX)$(DLLIMPEXT) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf2) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX).a -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3): $(DEPRECATEDDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__deprecateddll___targetsuf3): $(__deprecateddll_PCH_DEP) $(DEPRECATEDDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(DEPRECATEDDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__deprecateddll___macinstnamecmd) $(__deprecateddll___importlib) $(__deprecateddll___soname_flags) $(__deprecateddll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ $(__deprecateddll___so_symlinks_cmd) @@ -225,7 +239,7 @@ deprecateddll_treelay.o: $(srcdir)/treelay.cpp deprecateddll_wxexpr.o: $(srcdir)/wxexpr.cpp $(CXXC) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $< -@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX).a: $(DEPRECATEDLIB_OBJECTS) +@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX).a: $(__deprecatedlib_PCH_DEP) $(DEPRECATEDLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) rcu $@ $(DEPRECATEDLIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ @@ -252,8 +266,7 @@ deprecatedlib_wxexpr.o: $(srcdir)/wxexpr.cpp $(CXXC) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $< distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all $(__install_deprecateddll___depname) $(__install_deprecatedlib___depname) $(INSTALL_DIR) $(includedir) diff --git a/contrib/src/fl/Makefile.in b/contrib/src/fl/Makefile.in index 29586a484a..9b7f82be3a 100644 --- a/contrib/src/fl/Makefile.in +++ b/contrib/src/fl/Makefile.in @@ -41,11 +41,11 @@ top_srcdir = @top_srcdir@ ### Variables: ### -FLDLL_CXXFLAGS = $(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) \ - -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_FL $(CXXFLAGS) \ - $(PIC_FLAG) +FLDLL_CXXFLAGS = $(__fldll_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) -I$(srcdir)/../../include -DWXUSINGDLL \ + -DWXMAKINGDLL_FL $(CXXFLAGS) $(PIC_FLAG) FLDLL_OBJECTS = \ fldll_antiflickpl.o \ fldll_bardragpl.o \ @@ -64,10 +64,10 @@ FLDLL_OBJECTS = \ fldll_rowlayoutpl.o \ fldll_toolwnd.o \ fldll_updatesmgr.o -FLLIB_CXXFLAGS = $(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) \ - -I$(srcdir)/../../include $(CXXFLAGS) +FLLIB_CXXFLAGS = $(__fllib_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) -I$(srcdir)/../../include $(CXXFLAGS) FLLIB_OBJECTS = \ fllib_antiflickpl.o \ fllib_bardragpl.o \ @@ -141,6 +141,8 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_GCC_PCH_1@__fldll_PCH_DEP = .pch/wxprec_fldll/wx/wxprec.h.gch +@COND_GCC_PCH_1@__fldll_PCH_INC = -I.pch/wxprec_fldll COND_SHARED_1___fldll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) @COND_SHARED_1@__fldll___depname = $(COND_SHARED_1___fldll___depname) @@ -188,6 +190,8 @@ COND_USE_SOVERSOLARIS_1___fldll___soname_flags = \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__fldll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__fldll___targetsuf3 = .$(SO_SUFFIX) +@COND_GCC_PCH_1@__fllib_PCH_DEP = .pch/wxprec_fllib/wx/wxprec.h.gch +@COND_GCC_PCH_1@__fllib_PCH_INC = -I.pch/wxprec_fllib COND_SHARED_0___fllib___depname = \ $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).a @COND_SHARED_0@__fllib___depname = $(COND_SHARED_0___fllib___depname) @@ -198,8 +202,14 @@ COND_SHARED_0___fllib___depname = \ all: $(__fldll___depname) $(__fllib___depname) +@COND_GCC_PCH_1@.pch/wxprec_fldll/wx/wxprec.h.gch: +@COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_fldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FLDLL_CXXFLAGS) + +@COND_GCC_PCH_1@.pch/wxprec_fllib/wx/wxprec.h.gch: +@COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_fllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(FLLIB_CXXFLAGS) + clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @@ -207,10 +217,9 @@ clean: rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).a distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3): $(FLDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__fldll___targetsuf3): $(__fldll_PCH_DEP) $(FLDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(FLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__fldll___macinstnamecmd) $(__fldll___importlib) $(__fldll___soname_flags) $(__fldll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ $(__fldll___so_symlinks_cmd) @@ -265,7 +274,7 @@ fldll_toolwnd.o: $(srcdir)/toolwnd.cpp fldll_updatesmgr.o: $(srcdir)/updatesmgr.cpp $(CXXC) -c -o $@ $(FLDLL_CXXFLAGS) $< -@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).a: $(FLLIB_OBJECTS) +@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_fl-2.5$(HOST_SUFFIX).a: $(__fllib_PCH_DEP) $(FLLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) rcu $@ $(FLLIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ diff --git a/contrib/src/gizmos/Makefile.in b/contrib/src/gizmos/Makefile.in index b487dfd0c3..7fcd5ba007 100644 --- a/contrib/src/gizmos/Makefile.in +++ b/contrib/src/gizmos/Makefile.in @@ -41,11 +41,11 @@ top_srcdir = @top_srcdir@ ### Variables: ### -GIZMOSDLL_CXXFLAGS = $(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) \ - -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_GIZMOS $(CXXFLAGS) \ - $(PIC_FLAG) +GIZMOSDLL_CXXFLAGS = $(__gizmosdll_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) -I$(srcdir)/../../include -DWXUSINGDLL \ + -DWXMAKINGDLL_GIZMOS $(CXXFLAGS) $(PIC_FLAG) GIZMOSDLL_OBJECTS = \ gizmosdll_dynamicsash.o \ gizmosdll_editlbox.o \ @@ -53,10 +53,10 @@ GIZMOSDLL_OBJECTS = \ gizmosdll_multicell.o \ gizmosdll_splittree.o \ gizmosdll_statpict.o -GIZMOSLIB_CXXFLAGS = $(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) \ - -I$(srcdir)/../../include $(CXXFLAGS) +GIZMOSLIB_CXXFLAGS = $(__gizmoslib_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) -I$(srcdir)/../../include $(CXXFLAGS) GIZMOSLIB_OBJECTS = \ gizmoslib_dynamicsash.o \ gizmoslib_editlbox.o \ @@ -119,6 +119,8 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_GCC_PCH_1@__gizmosdll_PCH_DEP = .pch/wxprec_gizmosdll/wx/wxprec.h.gch +@COND_GCC_PCH_1@__gizmosdll_PCH_INC = -I.pch/wxprec_gizmosdll COND_SHARED_1___gizmosdll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) @COND_SHARED_1@__gizmosdll___depname = $(COND_SHARED_1___gizmosdll___depname) @@ -166,6 +168,8 @@ COND_USE_SOVERSOLARIS_1___gizmosdll___soname_flags = \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__gizmosdll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__gizmosdll___targetsuf3 = .$(SO_SUFFIX) +@COND_GCC_PCH_1@__gizmoslib_PCH_DEP = .pch/wxprec_gizmoslib/wx/wxprec.h.gch +@COND_GCC_PCH_1@__gizmoslib_PCH_INC = -I.pch/wxprec_gizmoslib COND_SHARED_0___gizmoslib___depname = \ $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).a @COND_SHARED_0@__gizmoslib___depname = $(COND_SHARED_0___gizmoslib___depname) @@ -176,8 +180,14 @@ COND_SHARED_0___gizmoslib___depname = \ all: $(__gizmosdll___depname) $(__gizmoslib___depname) +@COND_GCC_PCH_1@.pch/wxprec_gizmosdll/wx/wxprec.h.gch: +@COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_gizmosdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOSDLL_CXXFLAGS) + +@COND_GCC_PCH_1@.pch/wxprec_gizmoslib/wx/wxprec.h.gch: +@COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_gizmoslib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(GIZMOSLIB_CXXFLAGS) + clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @@ -185,10 +195,9 @@ clean: rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).a distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3): $(GIZMOSDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__gizmosdll___targetsuf3): $(__gizmosdll_PCH_DEP) $(GIZMOSDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__gizmosdll___macinstnamecmd) $(__gizmosdll___importlib) $(__gizmosdll___soname_flags) $(__gizmosdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_BASE_p) $(__WXLIB_CORE_p) @COND_SHARED_1@ $(__gizmosdll___so_symlinks_cmd) @@ -210,7 +219,7 @@ gizmosdll_splittree.o: $(srcdir)/splittree.cpp gizmosdll_statpict.o: $(srcdir)/statpict.cpp $(CXXC) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< -@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).a: $(GIZMOSLIB_OBJECTS) +@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos-2.5$(HOST_SUFFIX).a: $(__gizmoslib_PCH_DEP) $(GIZMOSLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) rcu $@ $(GIZMOSLIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ diff --git a/contrib/src/mmedia/Makefile.in b/contrib/src/mmedia/Makefile.in index 579543b3ed..b691ac9297 100644 --- a/contrib/src/mmedia/Makefile.in +++ b/contrib/src/mmedia/Makefile.in @@ -43,11 +43,11 @@ top_srcdir = @top_srcdir@ ### Variables: ### LIBDIRNAME = $(top_builddir)lib -MMEDIADLL_CXXFLAGS = $(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) \ - -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_MMEDIA $(CXXFLAGS) \ - $(PIC_FLAG) +MMEDIADLL_CXXFLAGS = $(__mmediadll_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) -I$(srcdir)/../../include -DWXUSINGDLL \ + -DWXMAKINGDLL_MMEDIA $(CXXFLAGS) $(PIC_FLAG) MMEDIADLL_OBJECTS = \ $(__MMEDIA_PLATFORM_SRC_OBJECTS) \ mmediadll_cdbase.o \ @@ -67,10 +67,10 @@ MMEDIADLL_OBJECTS = \ mmediadll_sndulaw.o \ mmediadll_sndwav.o \ mmediadll_vidbase.o -MMEDIALIB_CXXFLAGS = $(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) \ - -I$(srcdir)/../../include $(CXXFLAGS) +MMEDIALIB_CXXFLAGS = $(__mmedialib_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) -I$(srcdir)/../../include $(CXXFLAGS) MMEDIALIB_OBJECTS = \ $(__MMEDIA_PLATFORM_SRC_OBJECTS_1) \ mmedialib_cdbase.o \ @@ -164,6 +164,8 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_SHARED_1@__install_mmediadll___depname = install_mmediadll @COND_SHARED_0@__install_mmedialib___depname = install_mmedialib +@COND_GCC_PCH_1@__mmediadll_PCH_DEP = .pch/wxprec_mmediadll/wx/wxprec.h.gch +@COND_GCC_PCH_1@__mmediadll_PCH_INC = -I.pch/wxprec_mmediadll COND_SHARED_1___mmediadll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) @COND_SHARED_1@__mmediadll___depname = $(COND_SHARED_1___mmediadll___depname) @@ -211,6 +213,8 @@ COND_USE_SOVERSOLARIS_1___mmediadll___soname_flags = \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__mmediadll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__mmediadll___targetsuf3 = .$(SO_SUFFIX) +@COND_GCC_PCH_1@__mmedialib_PCH_DEP = .pch/wxprec_mmedialib/wx/wxprec.h.gch +@COND_GCC_PCH_1@__mmedialib_PCH_INC = -I.pch/wxprec_mmedialib COND_SHARED_0___mmedialib___depname = \ $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).a @COND_SHARED_0@__mmedialib___depname = $(COND_SHARED_0___mmedialib___depname) @@ -219,8 +223,14 @@ COND_SHARED_0___mmedialib___depname = \ all: $(__mmediadll___depname) $(__mmedialib___depname) +@COND_GCC_PCH_1@.pch/wxprec_mmediadll/wx/wxprec.h.gch: +@COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_mmediadll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MMEDIADLL_CXXFLAGS) + +@COND_GCC_PCH_1@.pch/wxprec_mmedialib/wx/wxprec.h.gch: +@COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_mmedialib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(MMEDIALIB_CXXFLAGS) + clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @@ -228,8 +238,7 @@ clean: rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).a distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all $(__install_mmediadll___depname) $(__install_mmedialib___depname) $(INSTALL_DIR) $(includedir) @@ -253,7 +262,7 @@ install-strip: install @COND_SHARED_0@ $(INSTALL_DIR) $(libdir) @COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).a $(libdir) -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3): $(MMEDIADLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__mmediadll___targetsuf3): $(__mmediadll_PCH_DEP) $(MMEDIADLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(MMEDIADLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__mmediadll___macinstnamecmd) $(__mmediadll___importlib) $(__mmediadll___soname_flags) $(__mmediadll___macver) $(EXTRALIBS_ESD) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ $(__mmediadll___so_symlinks_cmd) @@ -329,7 +338,7 @@ mmediadll_vidwin.o: $(srcdir)/vidwin.cpp mmediadll_vidxanm.o: $(srcdir)/vidxanm.cpp $(CXXC) -c -o $@ $(MMEDIADLL_CXXFLAGS) $< -@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).a: $(MMEDIALIB_OBJECTS) +@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX).a: $(__mmedialib_PCH_DEP) $(MMEDIALIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) rcu $@ $(MMEDIALIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ diff --git a/contrib/src/net/Makefile.in b/contrib/src/net/Makefile.in index 03a217321c..bba0a164f4 100644 --- a/contrib/src/net/Makefile.in +++ b/contrib/src/net/Makefile.in @@ -42,19 +42,19 @@ top_srcdir = @top_srcdir@ ### Variables: ### LIBDIRNAME = $(top_builddir)lib -NETUTILSDLL_CXXFLAGS = $(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) \ - -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_NETUTILS $(CXXFLAGS) \ - $(PIC_FLAG) +NETUTILSDLL_CXXFLAGS = $(__netutilsdll_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) -I$(srcdir)/../../include -DWXUSINGDLL \ + -DWXMAKINGDLL_NETUTILS $(CXXFLAGS) $(PIC_FLAG) NETUTILSDLL_OBJECTS = \ netutilsdll_email.o \ netutilsdll_smapi.o \ netutilsdll_web.o -NETUTILSLIB_CXXFLAGS = $(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) \ - -I$(srcdir)/../../include $(CXXFLAGS) +NETUTILSLIB_CXXFLAGS = $(__netutilslib_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) -I$(srcdir)/../../include $(CXXFLAGS) NETUTILSLIB_OBJECTS = \ netutilslib_email.o \ netutilslib_smapi.o \ @@ -115,6 +115,9 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_SHARED_1@__install_netutilsdll___depname = install_netutilsdll @COND_SHARED_0@__install_netutilslib___depname = install_netutilslib +@COND_GCC_PCH_1@__netutilsdll_PCH_DEP = \ +@COND_GCC_PCH_1@ .pch/wxprec_netutilsdll/wx/wxprec.h.gch +@COND_GCC_PCH_1@__netutilsdll_PCH_INC = -I.pch/wxprec_netutilsdll COND_SHARED_1___netutilsdll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) @COND_SHARED_1@__netutilsdll___depname = $(COND_SHARED_1___netutilsdll___depname) @@ -163,6 +166,9 @@ COND_USE_SOVERSOLARIS_1___netutilsdll___soname_flags = \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__netutilsdll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__netutilsdll___targetsuf3 = .$(SO_SUFFIX) +@COND_GCC_PCH_1@__netutilslib_PCH_DEP = \ +@COND_GCC_PCH_1@ .pch/wxprec_netutilslib/wx/wxprec.h.gch +@COND_GCC_PCH_1@__netutilslib_PCH_INC = -I.pch/wxprec_netutilslib COND_SHARED_0___netutilslib___depname = \ $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX).a @COND_SHARED_0@__netutilslib___depname = $(COND_SHARED_0___netutilslib___depname) @@ -171,8 +177,14 @@ COND_SHARED_0___netutilslib___depname = \ all: $(__netutilsdll___depname) $(__netutilslib___depname) +@COND_GCC_PCH_1@.pch/wxprec_netutilsdll/wx/wxprec.h.gch: +@COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_netutilsdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETUTILSDLL_CXXFLAGS) + +@COND_GCC_PCH_1@.pch/wxprec_netutilslib/wx/wxprec.h.gch: +@COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_netutilslib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(NETUTILSLIB_CXXFLAGS) + clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @@ -180,8 +192,7 @@ clean: rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX).a distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all $(__install_netutilsdll___depname) $(__install_netutilslib___depname) $(INSTALL_DIR) $(includedir) @@ -205,7 +216,7 @@ install-strip: install @COND_SHARED_0@ $(INSTALL_DIR) $(libdir) @COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX).a $(libdir) -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3): $(NETUTILSDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__netutilsdll___targetsuf3): $(__netutilsdll_PCH_DEP) $(NETUTILSDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(NETUTILSDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__netutilsdll___macinstnamecmd) $(__netutilsdll___importlib) $(__netutilsdll___soname_flags) $(__netutilsdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ $(__netutilsdll___so_symlinks_cmd) @@ -218,7 +229,7 @@ netutilsdll_smapi.o: $(srcdir)/smapi.cpp netutilsdll_web.o: $(srcdir)/web.cpp $(CXXC) -c -o $@ $(NETUTILSDLL_CXXFLAGS) $< -@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX).a: $(NETUTILSLIB_OBJECTS) +@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_netutils-2.5$(HOST_SUFFIX).a: $(__netutilslib_PCH_DEP) $(NETUTILSLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) rcu $@ $(NETUTILSLIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ diff --git a/contrib/src/ogl/Makefile.in b/contrib/src/ogl/Makefile.in index 54024c3ed6..20a9c3f999 100644 --- a/contrib/src/ogl/Makefile.in +++ b/contrib/src/ogl/Makefile.in @@ -42,11 +42,11 @@ top_srcdir = @top_srcdir@ ### Variables: ### LIBDIRNAME = $(top_builddir)lib -OGLDLL_CXXFLAGS = $(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) \ - -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_OGL $(CXXFLAGS) \ - $(PIC_FLAG) +OGLDLL_CXXFLAGS = $(__ogldll_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) -I$(srcdir)/../../include -DWXUSINGDLL \ + -DWXMAKINGDLL_OGL $(CXXFLAGS) $(PIC_FLAG) OGLDLL_OBJECTS = \ ogldll_basic2.o \ ogldll_canvas.o \ @@ -60,10 +60,10 @@ OGLDLL_OBJECTS = \ ogldll_constrnt.o \ ogldll_lines.o \ ogldll_ogldiag.o -OGLLIB_CXXFLAGS = $(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) \ - -I$(srcdir)/../../include $(CXXFLAGS) +OGLLIB_CXXFLAGS = $(__ogllib_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) -I$(srcdir)/../../include $(CXXFLAGS) OGLLIB_OBJECTS = \ ogllib_basic2.o \ ogllib_canvas.o \ @@ -133,6 +133,8 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_SHARED_1@__install_ogldll___depname = install_ogldll @COND_SHARED_0@__install_ogllib___depname = install_ogllib +@COND_GCC_PCH_1@__ogldll_PCH_DEP = .pch/wxprec_ogldll/wx/wxprec.h.gch +@COND_GCC_PCH_1@__ogldll_PCH_INC = -I.pch/wxprec_ogldll COND_SHARED_1___ogldll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) @COND_SHARED_1@__ogldll___depname = $(COND_SHARED_1___ogldll___depname) @@ -180,6 +182,8 @@ COND_USE_SOVERSOLARIS_1___ogldll___soname_flags = \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__ogldll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__ogldll___targetsuf3 = .$(SO_SUFFIX) +@COND_GCC_PCH_1@__ogllib_PCH_DEP = .pch/wxprec_ogllib/wx/wxprec.h.gch +@COND_GCC_PCH_1@__ogllib_PCH_INC = -I.pch/wxprec_ogllib COND_SHARED_0___ogllib___depname = \ $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a @COND_SHARED_0@__ogllib___depname = $(COND_SHARED_0___ogllib___depname) @@ -188,8 +192,14 @@ COND_SHARED_0___ogllib___depname = \ all: $(__ogldll___depname) $(__ogllib___depname) +@COND_GCC_PCH_1@.pch/wxprec_ogldll/wx/wxprec.h.gch: +@COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_ogldll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(OGLDLL_CXXFLAGS) + +@COND_GCC_PCH_1@.pch/wxprec_ogllib/wx/wxprec.h.gch: +@COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_ogllib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(OGLLIB_CXXFLAGS) + clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @@ -197,8 +207,7 @@ clean: rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all $(__install_ogldll___depname) $(__install_ogllib___depname) $(INSTALL_DIR) $(includedir) @@ -222,7 +231,7 @@ install-strip: install @COND_SHARED_0@ $(INSTALL_DIR) $(libdir) @COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a $(libdir) -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3): $(OGLDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__ogldll___targetsuf3): $(__ogldll_PCH_DEP) $(OGLDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(OGLDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__ogldll___macinstnamecmd) $(__ogldll___importlib) $(__ogldll___soname_flags) $(__ogldll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ $(__ogldll___so_symlinks_cmd) @@ -262,7 +271,7 @@ ogldll_ogldiag.o: $(srcdir)/ogldiag.cpp ogldll_oglmisc.o: $(srcdir)/oglmisc.cpp $(CXXC) -c -o $@ $(OGLDLL_CXXFLAGS) $< -@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a: $(OGLLIB_OBJECTS) +@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX).a: $(__ogllib_PCH_DEP) $(OGLLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) rcu $@ $(OGLLIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ diff --git a/contrib/src/plot/Makefile.in b/contrib/src/plot/Makefile.in index e6c5be3f85..1f39318cb7 100644 --- a/contrib/src/plot/Makefile.in +++ b/contrib/src/plot/Makefile.in @@ -42,17 +42,17 @@ top_srcdir = @top_srcdir@ ### Variables: ### LIBDIRNAME = $(top_builddir)lib -PLOTDLL_CXXFLAGS = $(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) \ - -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_PLOT $(CXXFLAGS) \ - $(PIC_FLAG) +PLOTDLL_CXXFLAGS = $(__plotdll_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) -I$(srcdir)/../../include -DWXUSINGDLL \ + -DWXMAKINGDLL_PLOT $(CXXFLAGS) $(PIC_FLAG) PLOTDLL_OBJECTS = \ plotdll_plot.o -PLOTLIB_CXXFLAGS = $(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) \ - -I$(srcdir)/../../include $(CXXFLAGS) +PLOTLIB_CXXFLAGS = $(__plotlib_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) -I$(srcdir)/../../include $(CXXFLAGS) PLOTLIB_OBJECTS = \ plotlib_plot.o @@ -111,6 +111,8 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_SHARED_1@__install_plotdll___depname = install_plotdll @COND_SHARED_0@__install_plotlib___depname = install_plotlib +@COND_GCC_PCH_1@__plotdll_PCH_DEP = .pch/wxprec_plotdll/wx/wxprec.h.gch +@COND_GCC_PCH_1@__plotdll_PCH_INC = -I.pch/wxprec_plotdll COND_SHARED_1___plotdll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3) @COND_SHARED_1@__plotdll___depname = $(COND_SHARED_1___plotdll___depname) @@ -158,6 +160,8 @@ COND_USE_SOVERSOLARIS_1___plotdll___soname_flags = \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__plotdll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__plotdll___targetsuf3 = .$(SO_SUFFIX) +@COND_GCC_PCH_1@__plotlib_PCH_DEP = .pch/wxprec_plotlib/wx/wxprec.h.gch +@COND_GCC_PCH_1@__plotlib_PCH_INC = -I.pch/wxprec_plotlib COND_SHARED_0___plotlib___depname = \ $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX).a @COND_SHARED_0@__plotlib___depname = $(COND_SHARED_0___plotlib___depname) @@ -166,8 +170,14 @@ COND_SHARED_0___plotlib___depname = \ all: $(__plotdll___depname) $(__plotlib___depname) +@COND_GCC_PCH_1@.pch/wxprec_plotdll/wx/wxprec.h.gch: +@COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_plotdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(PLOTDLL_CXXFLAGS) + +@COND_GCC_PCH_1@.pch/wxprec_plotlib/wx/wxprec.h.gch: +@COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_plotlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(PLOTLIB_CXXFLAGS) + clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @@ -175,8 +185,7 @@ clean: rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX).a distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all $(__install_plotdll___depname) $(__install_plotlib___depname) $(INSTALL_DIR) $(includedir) @@ -200,14 +209,14 @@ install-strip: install @COND_SHARED_0@ $(INSTALL_DIR) $(libdir) @COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX).a $(libdir) -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3): $(PLOTDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__plotdll___targetsuf3): $(__plotdll_PCH_DEP) $(PLOTDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(PLOTDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__plotdll___macinstnamecmd) $(__plotdll___importlib) $(__plotdll___soname_flags) $(__plotdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ $(__plotdll___so_symlinks_cmd) plotdll_plot.o: $(srcdir)/plot.cpp $(CXXC) -c -o $@ $(PLOTDLL_CXXFLAGS) $< -@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX).a: $(PLOTLIB_OBJECTS) +@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_plot-2.5$(HOST_SUFFIX).a: $(__plotlib_PCH_DEP) $(PLOTLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) rcu $@ $(PLOTLIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ diff --git a/contrib/src/stc/Makefile.in b/contrib/src/stc/Makefile.in index 5e51959bb0..d4347e9b39 100644 --- a/contrib/src/stc/Makefile.in +++ b/contrib/src/stc/Makefile.in @@ -265,7 +265,7 @@ COND_SHARED_0___stclib___depname = \ all: $(__stcdll___depname) $(__stclib___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @@ -273,8 +273,7 @@ clean: rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all $(__install_stcdll___depname) $(__install_stclib___depname) $(INSTALL_DIR) $(includedir) diff --git a/contrib/src/svg/Makefile.in b/contrib/src/svg/Makefile.in index 33a21aafc7..bd8bb3aec1 100644 --- a/contrib/src/svg/Makefile.in +++ b/contrib/src/svg/Makefile.in @@ -42,17 +42,17 @@ top_srcdir = @top_srcdir@ ### Variables: ### LIBDIRNAME = $(top_builddir)lib -SVGDLL_CXXFLAGS = $(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) \ - -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_SVG $(CXXFLAGS) \ - $(PIC_FLAG) +SVGDLL_CXXFLAGS = $(__svgdll_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) -I$(srcdir)/../../include -DWXUSINGDLL \ + -DWXMAKINGDLL_SVG $(CXXFLAGS) $(PIC_FLAG) SVGDLL_OBJECTS = \ svgdll_dcsvg.o -SVGLIB_CXXFLAGS = $(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) \ - -I$(srcdir)/../../include $(CXXFLAGS) +SVGLIB_CXXFLAGS = $(__svglib_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) -I$(srcdir)/../../include $(CXXFLAGS) SVGLIB_OBJECTS = \ svglib_dcsvg.o @@ -111,6 +111,8 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_SHARED_1@__install_svgdll___depname = install_svgdll @COND_SHARED_0@__install_svglib___depname = install_svglib +@COND_GCC_PCH_1@__svgdll_PCH_DEP = .pch/wxprec_svgdll/wx/wxprec.h.gch +@COND_GCC_PCH_1@__svgdll_PCH_INC = -I.pch/wxprec_svgdll COND_SHARED_1___svgdll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3) @COND_SHARED_1@__svgdll___depname = $(COND_SHARED_1___svgdll___depname) @@ -158,6 +160,8 @@ COND_USE_SOVERSOLARIS_1___svgdll___soname_flags = \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__svgdll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__svgdll___targetsuf3 = .$(SO_SUFFIX) +@COND_GCC_PCH_1@__svglib_PCH_DEP = .pch/wxprec_svglib/wx/wxprec.h.gch +@COND_GCC_PCH_1@__svglib_PCH_INC = -I.pch/wxprec_svglib COND_SHARED_0___svglib___depname = \ $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX).a @COND_SHARED_0@__svglib___depname = $(COND_SHARED_0___svglib___depname) @@ -166,8 +170,14 @@ COND_SHARED_0___svglib___depname = \ all: $(__svgdll___depname) $(__svglib___depname) +@COND_GCC_PCH_1@.pch/wxprec_svgdll/wx/wxprec.h.gch: +@COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_svgdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(SVGDLL_CXXFLAGS) + +@COND_GCC_PCH_1@.pch/wxprec_svglib/wx/wxprec.h.gch: +@COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_svglib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(SVGLIB_CXXFLAGS) + clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @@ -175,8 +185,7 @@ clean: rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX).a distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all $(__install_svgdll___depname) $(__install_svglib___depname) $(INSTALL_DIR) $(includedir) @@ -200,14 +209,14 @@ install-strip: install @COND_SHARED_0@ $(INSTALL_DIR) $(libdir) @COND_SHARED_0@ $(INSTALL_DATA) $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX).a $(libdir) -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3): $(SVGDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__svgdll___targetsuf3): $(__svgdll_PCH_DEP) $(SVGDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(SVGDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__svgdll___macinstnamecmd) $(__svgdll___importlib) $(__svgdll___soname_flags) $(__svgdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ $(__svgdll___so_symlinks_cmd) svgdll_dcsvg.o: $(srcdir)/dcsvg.cpp $(CXXC) -c -o $@ $(SVGDLL_CXXFLAGS) $< -@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX).a: $(SVGLIB_OBJECTS) +@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg-2.5$(HOST_SUFFIX).a: $(__svglib_PCH_DEP) $(SVGLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) rcu $@ $(SVGLIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ diff --git a/contrib/src/xrc/Makefile.in b/contrib/src/xrc/Makefile.in index 20d4c214e0..bce5f87200 100644 --- a/contrib/src/xrc/Makefile.in +++ b/contrib/src/xrc/Makefile.in @@ -42,11 +42,11 @@ top_srcdir = @top_srcdir@ ### Variables: ### LIBDIRNAME = $(top_builddir)lib -XRCDLL_CXXFLAGS = $(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) \ - -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_XRC $(CXXFLAGS) \ - $(PIC_FLAG) +XRCDLL_CXXFLAGS = $(__xrcdll_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) -I$(srcdir)/../../include -DWXUSINGDLL \ + -DWXMAKINGDLL_XRC $(CXXFLAGS) $(PIC_FLAG) XRCDLL_OBJECTS = \ xrcdll_xmlres.o \ xrcdll_xh_bmp.o \ @@ -85,11 +85,11 @@ XRCDLL_OBJECTS = \ xrcdll_xh_unkwn.o \ xrcdll_xh_wizrd.o \ xrcdll_xmlrsall.o -XRCLIB_CXXFLAGS = $(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) \ - -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse \ - -I$(srcdir)/expat/xmltok $(CXXFLAGS) +XRCLIB_CXXFLAGS = $(__xrclib_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) -I$(srcdir)/../../include \ + -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) XRCLIB_OBJECTS = \ xrclib_xmlres.o \ xrclib_xh_bmp.o \ @@ -192,6 +192,8 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_SHARED_1@__install_xrcdll___depname = install_xrcdll @COND_SHARED_0@__install_xrclib___depname = install_xrclib +@COND_GCC_PCH_1@__xrcdll_PCH_DEP = .pch/wxprec_xrcdll/wx/wxprec.h.gch +@COND_GCC_PCH_1@__xrcdll_PCH_INC = -I.pch/wxprec_xrcdll COND_SHARED_1___xrcdll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) @COND_SHARED_1@__xrcdll___depname = $(COND_SHARED_1___xrcdll___depname) @@ -239,6 +241,8 @@ COND_USE_SOVERSOLARIS_1___xrcdll___soname_flags = \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__xrcdll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__xrcdll___targetsuf3 = .$(SO_SUFFIX) +@COND_GCC_PCH_1@__xrclib_PCH_DEP = .pch/wxprec_xrclib/wx/wxprec.h.gch +@COND_GCC_PCH_1@__xrclib_PCH_INC = -I.pch/wxprec_xrclib COND_SHARED_0___xrclib___depname = \ $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a @COND_SHARED_0@__xrclib___depname = $(COND_SHARED_0___xrclib___depname) @@ -247,8 +251,14 @@ COND_SHARED_0___xrclib___depname = \ all: $(__xrcdll___depname) $(__xrclib___depname) +@COND_GCC_PCH_1@.pch/wxprec_xrcdll/wx/wxprec.h.gch: +@COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_xrcdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XRCDLL_CXXFLAGS) + +@COND_GCC_PCH_1@.pch/wxprec_xrclib/wx/wxprec.h.gch: +@COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_xrclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XRCLIB_CXXFLAGS) + clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @@ -256,8 +266,7 @@ clean: rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all $(__install_xrcdll___depname) $(__install_xrclib___depname) $(INSTALL_DIR) $(includedir) @@ -283,7 +292,7 @@ install-strip: install uninstall: -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3): $(XRCDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3): $(__xrcdll_PCH_DEP) $(XRCDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(XRCDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(__xrcdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ $(__xrcdll___so_symlinks_cmd) @@ -398,7 +407,7 @@ xrcdll_xmlres.o: $(srcdir)/xmlres.cpp xrcdll_xmlrsall.o: $(srcdir)/xmlrsall.cpp $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a: $(XRCLIB_OBJECTS) +@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a: $(__xrclib_PCH_DEP) $(XRCLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) rcu $@ $(XRCLIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ diff --git a/src/stc/Makefile.in b/src/stc/Makefile.in index 5e51959bb0..d4347e9b39 100644 --- a/src/stc/Makefile.in +++ b/src/stc/Makefile.in @@ -265,7 +265,7 @@ COND_SHARED_0___stclib___depname = \ all: $(__stcdll___depname) $(__stclib___depname) clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__stcdll___targetsuf3) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @@ -273,8 +273,7 @@ clean: rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_stc-2.5$(HOST_SUFFIX).a distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all $(__install_stcdll___depname) $(__install_stclib___depname) $(INSTALL_DIR) $(includedir) diff --git a/src/xrc/Makefile.in b/src/xrc/Makefile.in index 20d4c214e0..bce5f87200 100644 --- a/src/xrc/Makefile.in +++ b/src/xrc/Makefile.in @@ -42,11 +42,11 @@ top_srcdir = @top_srcdir@ ### Variables: ### LIBDIRNAME = $(top_builddir)lib -XRCDLL_CXXFLAGS = $(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) \ - -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_XRC $(CXXFLAGS) \ - $(PIC_FLAG) +XRCDLL_CXXFLAGS = $(__xrcdll_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) -I$(srcdir)/../../include -DWXUSINGDLL \ + -DWXMAKINGDLL_XRC $(CXXFLAGS) $(PIC_FLAG) XRCDLL_OBJECTS = \ xrcdll_xmlres.o \ xrcdll_xh_bmp.o \ @@ -85,11 +85,11 @@ XRCDLL_OBJECTS = \ xrcdll_xh_unkwn.o \ xrcdll_xh_wizrd.o \ xrcdll_xmlrsall.o -XRCLIB_CXXFLAGS = $(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) \ - -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse \ - -I$(srcdir)/expat/xmltok $(CXXFLAGS) +XRCLIB_CXXFLAGS = $(__xrclib_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) -I$(srcdir)/../../include \ + -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) XRCLIB_OBJECTS = \ xrclib_xmlres.o \ xrclib_xh_bmp.o \ @@ -192,6 +192,8 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_SHARED_1@__install_xrcdll___depname = install_xrcdll @COND_SHARED_0@__install_xrclib___depname = install_xrclib +@COND_GCC_PCH_1@__xrcdll_PCH_DEP = .pch/wxprec_xrcdll/wx/wxprec.h.gch +@COND_GCC_PCH_1@__xrcdll_PCH_INC = -I.pch/wxprec_xrcdll COND_SHARED_1___xrcdll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) @COND_SHARED_1@__xrcdll___depname = $(COND_SHARED_1___xrcdll___depname) @@ -239,6 +241,8 @@ COND_USE_SOVERSOLARIS_1___xrcdll___soname_flags = \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__xrcdll___targetsuf3 \ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .0.0.0.$(SO_SUFFIX) @COND_USE_SOVERSION_0@__xrcdll___targetsuf3 = .$(SO_SUFFIX) +@COND_GCC_PCH_1@__xrclib_PCH_DEP = .pch/wxprec_xrclib/wx/wxprec.h.gch +@COND_GCC_PCH_1@__xrclib_PCH_INC = -I.pch/wxprec_xrclib COND_SHARED_0___xrclib___depname = \ $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a @COND_SHARED_0@__xrclib___depname = $(COND_SHARED_0___xrclib___depname) @@ -247,8 +251,14 @@ COND_SHARED_0___xrclib___depname = \ all: $(__xrcdll___depname) $(__xrclib___depname) +@COND_GCC_PCH_1@.pch/wxprec_xrcdll/wx/wxprec.h.gch: +@COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_xrcdll/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XRCDLL_CXXFLAGS) + +@COND_GCC_PCH_1@.pch/wxprec_xrclib/wx/wxprec.h.gch: +@COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/wxprec_xrclib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(XRCLIB_CXXFLAGS) + clean: - rm -rf ./.deps + rm -rf ./.deps ./.pch rm -f ./*.o rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) @@ -256,8 +266,7 @@ clean: rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a distclean: clean - rm -f configure config.cache config.log config.status - rm -f bk-deps shared-ld-sh + rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile install: all $(__install_xrcdll___depname) $(__install_xrclib___depname) $(INSTALL_DIR) $(includedir) @@ -283,7 +292,7 @@ install-strip: install uninstall: -@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3): $(XRCDLL_OBJECTS) +@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3): $(__xrcdll_PCH_DEP) $(XRCDLL_OBJECTS) @COND_SHARED_1@ $(SHARED_LD_CXX) $@ $(XRCDLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(__xrcdll___macver) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) @COND_SHARED_1@ $(__xrcdll___so_symlinks_cmd) @@ -398,7 +407,7 @@ xrcdll_xmlres.o: $(srcdir)/xmlres.cpp xrcdll_xmlrsall.o: $(srcdir)/xmlrsall.cpp $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $< -@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a: $(XRCLIB_OBJECTS) +@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a: $(__xrclib_PCH_DEP) $(XRCLIB_OBJECTS) @COND_SHARED_0@ rm -f $@ @COND_SHARED_0@ $(AR) rcu $@ $(XRCLIB_OBJECTS) @COND_SHARED_0@ $(RANLIB) $@ -- 2.45.2