-@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
-@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
-@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
-@COND_DEPS_TRACKING_1@CCC = $(top_builddir)bk-deps $(CC)
-@COND_DEPS_TRACKING_0@CCC = $(CC)
-@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
-@COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
-@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a
-@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX)
-@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__
-@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
-@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o nativdlg$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
-@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff
-@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
-@COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5
+@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
+@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
+@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
+@COND_WXUSE_LIBJPEG_builtin@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg
+@COND_WXUSE_LIBJPEG_builtin@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg
+@COND_WXUSE_LIBJPEG_builtin@__INC_JPEG_p_2 = --include-dir $(top_srcdir)/src/jpeg
+@COND_WXUSE_ODBC_builtin@__INC_ODBC_p = -I$(top_srcdir)/src/odbc
+@COND_WXUSE_ODBC_builtin@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc
+@COND_WXUSE_ODBC_builtin@__INC_ODBC_p_2 = --include-dir $(top_srcdir)/src/odbc
+@COND_WXUSE_LIBPNG_builtin@__INC_PNG_p = -I$(top_srcdir)/src/png
+@COND_WXUSE_LIBPNG_builtin@__INC_PNG_p_1 = -i $(top_srcdir)/src/png
+@COND_WXUSE_LIBPNG_builtin@__INC_PNG_p_2 = --include-dir $(top_srcdir)/src/png
+@COND_WXUSE_REGEX_builtin@__INC_REGEX_p = -I$(top_srcdir)/src/regex
+@COND_WXUSE_REGEX_builtin@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex
+@COND_WXUSE_REGEX_builtin@__INC_REGEX_p_2 = --include-dir $(top_srcdir)/src/regex
+@COND_WXUSE_LIBTIFF_builtin@__INC_TIFF_p = -I$(top_srcdir)/src/tiff
+@COND_WXUSE_LIBTIFF_builtin@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff
+@COND_WXUSE_LIBTIFF_builtin@__INC_TIFF_p_2 = --include-dir $(top_srcdir)/src/tiff
+@COND_WXUSE_ZLIB_builtin@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib
+@COND_WXUSE_ZLIB_builtin@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib
+@COND_WXUSE_ZLIB_builtin@__INC_ZLIB_p_2 = --include-dir $(top_srcdir)/src/zlib
+@COND_WXUSE_LIBJPEG_builtin@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+@COND_WXUSE_ODBC_builtin@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG)
+@COND_WXUSE_LIBPNG_builtin@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+@COND_WXUSE_REGEX_builtin@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG)
+@COND_WXUSE_LIBTIFF_builtin@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+@COND_WXUSE_ZLIB_builtin@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG)
+@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o nativdlg$(EXEEXT) Carbon.r $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
+@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx_base$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
+@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5