X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c656b783895e5f99acf98db05f23c590d0945cfc..486c8bdfc9a490e42475e5604b22037f853d72b7:/src/xrc/Makefile.in?ds=sidebyside

diff --git a/src/xrc/Makefile.in b/src/xrc/Makefile.in
index 19d1a54952..13c5eb4fb5 100644
--- a/src/xrc/Makefile.in
+++ b/src/xrc/Makefile.in
@@ -32,7 +32,7 @@ CC = @CC@
 datadir = @datadir@
 PLATFORM_MSDOS = @PLATFORM_MSDOS@
 SETFILE = @SETFILE@
-UNICODE = @UNICODE@
+LDFLAGS = @LDFLAGS@
 STRIP = @STRIP@
 USE_SOVERSOLARIS = @USE_SOVERSOLARIS@
 srcdir = @srcdir@
@@ -41,24 +41,28 @@ wxUSE_REGEX = @wxUSE_REGEX@
 bindir = @bindir@
 PIC_FLAG = @PIC_FLAG@
 USE_SOSYMLINKS = @USE_SOSYMLINKS@
-wxUSE_LIBJPEG = @wxUSE_LIBJPEG@
+LDFLAGS_GUI = @LDFLAGS_GUI@
 INSTALL_DATA = @INSTALL_DATA@
 USE_GUI = @USE_GUI@
 PLATFORM_UNIX = @PLATFORM_UNIX@
 RANLIB = @RANLIB@
 SO_SUFFIX = @SO_SUFFIX@
 top_srcdir = @top_srcdir@
+wxUSE_LIBJPEG = @wxUSE_LIBJPEG@
 AR = @AR@
 BUILD = @BUILD@
 PLATFORM_WIN32 = @PLATFORM_WIN32@
 USE_MACVERSION = @USE_MACVERSION@
 PLATFORM_MACOSX = @PLATFORM_MACOSX@
 DEPS_TRACKING = @DEPS_TRACKING@
-TOOLKIT_VERSION = @TOOLKIT_VERSION@
+OFFICIAL_BUILD = @OFFICIAL_BUILD@
+UNICODE = @UNICODE@
 WXUNIV = @WXUNIV@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 CXX = @CXX@
 SHARED_LD_CXX = @SHARED_LD_CXX@
+VENDOR = @VENDOR@
+TOOLKIT_VERSION = @TOOLKIT_VERSION@
 includedir = @includedir@
 LN_S = @LN_S@
 CFLAGS = @CFLAGS@
@@ -68,223 +72,268 @@ USE_SOVERLINUX = @USE_SOVERLINUX@
 top_builddir = @top_builddir@
 SHARED_LD_CC = @SHARED_LD_CC@
 
+### Variables: ###
+
+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) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2)   -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG)
+XRCDLL_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) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2)   -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS) $(PIC_FLAG)
+XRCLIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__DEBUGFLAG_5) $(__OPTIMIZEFLAG_7)   -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS)
+XRCLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__DEBUGFLAG_5) $(__OPTIMIZEFLAG_7)   -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS)
+
 ### Conditionally set variables: ###
 
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib
+@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG)
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_BUILD_DEBUG@WXDEBUGFLAG = d
-@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc
+@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
+@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5
+@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(srcdir)/src/jpeg
+@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng$(WXDEBUGFLAG)
+@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(srcdir)/src/zlib
+@COND_WXUSE_LIBJPEG_BUILTIN@INC_JPEG = $(srcdir)/src/jpeg
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+@COND_WXUSE_ZLIB_BUILTIN@INC_ZLIB = $(srcdir)/src/zlib
+@COND_BUILD_DEBUG@OPTIMIZEFLAG = off
+@COND_BUILD_RELEASE@OPTIMIZEFLAG = speed
+@COND_SHARED_1@__install_xrcdll___depname = install_xrcdll
 @COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)
 @COND_DEPS_TRACKING_0@CCC = $(CC)
-@COND_USE_SOVERSION_1_PLATFORM_MACOSX_0@__xrcdll___targetsuf2 = .$(SO_SUFFIX).0
-@COND_USE_SOVERSION_1_PLATFORM_MACOSX_1@__xrcdll___targetsuf2 = .0.$(SO_SUFFIX)
-@COND_USE_SOVERSION_1_PLATFORM_MACOSX_0@__xrcdll___targetsuf3 = .$(SO_SUFFIX).0.0.0
-@COND_USE_SOVERSION_1_PLATFORM_MACOSX_1@__xrcdll___targetsuf3 = .0.0.0.$(SO_SUFFIX)
+@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__xrcdll___targetsuf2 = .$(SO_SUFFIX).0
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__xrcdll___targetsuf2 = .0.$(SO_SUFFIX)
+@COND_USE_SOVERSION_0@__xrcdll___targetsuf2 = .$(SO_SUFFIX)
+@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc$(WXDEBUGFLAG)
 @COND_PLATFORM_WIN32_1@DLLIMPEXT = .a
 @COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX)
 @COND_SHARED_0@__xrclib___depname = $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a
+@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib
 @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
-@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_cmd = rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2); \
-@COND_USE_SOSYMLINKS_1@                $(LN_S) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3) $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2); \
-@COND_USE_SOSYMLINKS_1@                $(LN_S) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT)
-@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
+@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_cmd = rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \
+@COND_USE_SOSYMLINKS_1@                $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \
+@COND_USE_SOSYMLINKS_1@                $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT)
+@COND_BUILD_DEBUG@__OPTIMIZEFLAG_2 = 
+@COND_BUILD_RELEASE@__OPTIMIZEFLAG_2 = 
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__xrcdll___targetsuf3 = .$(SO_SUFFIX).0.0.0
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__xrcdll___targetsuf3 = .0.0.0.$(SO_SUFFIX)
+@COND_USE_SOVERSION_0@__xrcdll___targetsuf3 = .$(SO_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_HTML_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5
+@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(srcdir)/src/png
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
 @COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
-@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_inst_cmd = rm -f libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2); \
-@COND_USE_SOSYMLINKS_1@                $(LN_S) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2); \
-@COND_USE_SOSYMLINKS_1@                $(LN_S) $(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2) libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT)
-@COND_USE_SOVERLINUX_1@__xrcdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2)
-@COND_USE_SOVERSOLARIS_1@__xrcdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3)
-@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
+@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = -I$(srcdir)/src/regex
+@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = -I$(srcdir)/src/tiff
+@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = -I$(srcdir)/src/png
+@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = --include-dir $(srcdir)/src/png
+@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = --include-dir $(srcdir)/src/tiff
+@COND_BUILD_DEBUG@__DEBUGFLAG_5 = 
+@COND_BUILD_RELEASE@__DEBUGFLAG_5 = 
+@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = -I$(srcdir)/src/zlib
+@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg
+@COND_USE_SOVERLINUX_1@__xrcdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2)
+@COND_USE_SOVERSOLARIS_1@__xrcdll___soname_flags = $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3)
+@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = -I$(srcdir)/src/jpeg
+@COND_BUILD_DEBUG@__OPTIMIZEFLAG_7 = 
+@COND_BUILD_RELEASE@__OPTIMIZEFLAG_7 = 
+@COND_PLATFORM_MACOSX_1@__xrcdll___macver = -compatibility_version 2.5 -current_version 2.5.0
+@COND_WXUSE_REGEX_BUILTIN@INC_REGEX = $(srcdir)/src/regex
 @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
 @COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_PLATFORM_MACOSX_1@__xrcdll___macver = -compatibility_version 2.5 -current_version 2.5.0
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
+@COND_PLATFORM_UNIX_1@TIFF_PLATFORM_SRC = src/tiff/tif_unix.c
+@COND_PLATFORM_MACOSX_1@TIFF_PLATFORM_SRC = src/tiff/tif_unix.c
+@COND_PLATFORM_WIN32_1@TIFF_PLATFORM_SRC = src/tiff/tif_win32.c
+@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG)
+@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)25
+@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
+@COND_WXUSE_LIBPNG_BUILTIN@INC_PNG = $(srcdir)/src/png
+@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(srcdir)/src/odbc
+@COND_PLATFORM_WIN32_1@__xrcdll___importlib = -Wl,--out-implib,libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT)
+@COND_PLATFORM_WIN32_1@__xrcdll___importlib = -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT)
 @COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_PLATFORM_MACOSX_1@__xrcdll___macinstnamecmd = -install_name $(libdir)/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2)
+@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
+@COND_WXUSE_ODBC_BUILTIN@INC_ODBC = $(srcdir)/src/odbc
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
-@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
-@COND_SHARED_1@__install_xrcdll___depname = install_xrcdll
+@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib$(WXDEBUGFLAG)
+@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(srcdir)/src/regex
 @COND_SHARED_0@__install_xrclib___depname = install_xrclib
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex
-@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
-@COND_PLATFORM_WIN32_1@__xrcdll___importlib = -Wl,--out-implib,libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT)
-@COND_PLATFORM_WIN32_1@__xrcdll___importlib = -Wl,--out-implib,$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT)
-@COND_MONOLITHIC_0@__WXLIB_HTML_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5
+@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIX = wx25
+@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIX = wx
+@COND_BUILD_DEBUG@__DEBUGFLAG_1 = 
+@COND_BUILD_RELEASE@__DEBUGFLAG_1 = 
+@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG)
+@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(srcdir)/src/tiff
+@COND_WXUSE_LIBTIFF_BUILTIN@INC_TIFF = $(srcdir)/src/tiff
+@COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5
 @COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__
-@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff
+@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = -I$(srcdir)/src/odbc
+@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_inst_cmd = rm -f libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \
+@COND_USE_SOSYMLINKS_1@                $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \
+@COND_USE_SOSYMLINKS_1@                $(LN_S) $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT)
+@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 @COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
-@COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5
-@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = -D__WXUNIVERSAL__
-@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
-@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = -D__WXUNIVERSAL__
+@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = --include-dir $(srcdir)/src/regex
+@COND_BUILD_DEBUG@__DEBUGFLAG_0 = 
+@COND_BUILD_RELEASE@__DEBUGFLAG_0 = 
+@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg$(WXDEBUGFLAG)
+@COND_PLATFORM_MACOSX_1@__xrcdll___macinstnamecmd = -install_name $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2)
+@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = --include-dir $(srcdir)/src/odbc
+@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff$(WXDEBUGFLAG)
+@COND_BUILD_DEBUG@__DEBUGFLAG_6 = 
+@COND_BUILD_RELEASE@__DEBUGFLAG_6 = 
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_SHARED_1@__xrcdll___depname = $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3)
-@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex
+@COND_BUILD_DEBUG@DEBUGFLAG = on
+@COND_BUILD_RELEASE@DEBUGFLAG = off
+@COND_SHARED_1@__xrcdll___depname = $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3)
+@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex$(WXDEBUGFLAG)
+@COND_OFFICIAL_BUILD_1@VENDORTAG = 
+@COND_OFFICIAL_BUILD_0@VENDORTAG = _$(VENDOR)
 
 ### Targets: ###
 
 all: $(__xrcdll___depname) $(__xrclib___depname)
 
 install-strip: install
-	$(STRIP) $(libdir)/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3)
+	$(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3)
 
-xh_notbk.o: $(srcdir)/xh_notbk.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+xrcdll-xh_toolb.o: $(srcdir)/xh_toolb.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xh_listb.o: $(srcdir)/xh_listb.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+xrcdll-xh_tree.o: $(srcdir)/xh_tree.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrclib-xh_listc.o: $(srcdir)/xh_listc.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+xrcdll-xh_combo.o: $(srcdir)/xh_combo.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xh_stlin.o: $(srcdir)/xh_stlin.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+xrcdll-xmlparse.o: $(srcdir)/expat/xmlparse/xmlparse.c
+	$(CCC) -c -o $@ $(XRCDLL_CFLAGS) $<
 
-xh_toolb.o: $(srcdir)/xh_toolb.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+xrcdll-xh_radbt.o: $(srcdir)/xh_radbt.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xmlparse.o: $(srcdir)/expat/xmlparse/xmlparse.c
-	$(CCC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS) $(PIC_FLAG) $<
+xrcdll-xh_stbmp.o: $(srcdir)/xh_stbmp.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrclib-xh_html.o: $(srcdir)/xh_html.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib-xh_sttxt.o: $(srcdir)/xh_sttxt.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib-xh_gdctl.o: $(srcdir)/xh_gdctl.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a: xrclib-xmlparse.o xrclib-xmltok.o xrclib-xmlrole.o xrclib-xml.o xrclib-xmlres.o xrclib-xh_bmp.o xrclib-xh_bmpbt.o xrclib-xh_bttn.o xrclib-xh_cald.o xrclib-xh_chckb.o xrclib-xh_chckl.o xrclib-xh_choic.o xrclib-xh_combo.o xrclib-xh_dlg.o xrclib-xh_frame.o xrclib-xh_gauge.o xrclib-xh_gdctl.o xrclib-xh_html.o xrclib-xh_listb.o xrclib-xh_listc.o xrclib-xh_menu.o xrclib-xh_notbk.o xrclib-xh_panel.o xrclib-xh_radbt.o xrclib-xh_radbx.o xrclib-xh_scrol.o xrclib-xh_scwin.o xrclib-xh_sizer.o xrclib-xh_slidr.o xrclib-xh_spin.o xrclib-xh_split.o xrclib-xh_stbmp.o xrclib-xh_stbox.o xrclib-xh_stlin.o xrclib-xh_sttxt.o xrclib-xh_text.o xrclib-xh_toolb.o xrclib-xh_tree.o xrclib-xh_unkwn.o xrclib-xh_wizrd.o xrclib-xmlrsall.o
-	rm -f $@
-	$(AR) rcu $@  xrclib-xmlparse.o xrclib-xmltok.o xrclib-xmlrole.o xrclib-xml.o xrclib-xmlres.o xrclib-xh_bmp.o xrclib-xh_bmpbt.o xrclib-xh_bttn.o xrclib-xh_cald.o xrclib-xh_chckb.o xrclib-xh_chckl.o xrclib-xh_choic.o xrclib-xh_combo.o xrclib-xh_dlg.o xrclib-xh_frame.o xrclib-xh_gauge.o xrclib-xh_gdctl.o xrclib-xh_html.o xrclib-xh_listb.o xrclib-xh_listc.o xrclib-xh_menu.o xrclib-xh_notbk.o xrclib-xh_panel.o xrclib-xh_radbt.o xrclib-xh_radbx.o xrclib-xh_scrol.o xrclib-xh_scwin.o xrclib-xh_sizer.o xrclib-xh_slidr.o xrclib-xh_spin.o xrclib-xh_split.o xrclib-xh_stbmp.o xrclib-xh_stbox.o xrclib-xh_stlin.o xrclib-xh_sttxt.o xrclib-xh_text.o xrclib-xh_toolb.o xrclib-xh_tree.o xrclib-xh_unkwn.o xrclib-xh_wizrd.o xrclib-xmlrsall.o
-	$(RANLIB) $@
+@COND_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a: xrclib-xmlparse.o xrclib-xmltok.o xrclib-xmlrole.o xrclib-xml.o xrclib-xmlres.o xrclib-xh_bmp.o xrclib-xh_bmpbt.o xrclib-xh_bttn.o xrclib-xh_cald.o xrclib-xh_chckb.o xrclib-xh_chckl.o xrclib-xh_choic.o xrclib-xh_combo.o xrclib-xh_dlg.o xrclib-xh_frame.o xrclib-xh_gauge.o xrclib-xh_gdctl.o xrclib-xh_html.o xrclib-xh_listb.o xrclib-xh_listc.o xrclib-xh_menu.o xrclib-xh_notbk.o xrclib-xh_panel.o xrclib-xh_radbt.o xrclib-xh_radbx.o xrclib-xh_scrol.o xrclib-xh_scwin.o xrclib-xh_sizer.o xrclib-xh_slidr.o xrclib-xh_spin.o xrclib-xh_split.o xrclib-xh_stbmp.o xrclib-xh_stbox.o xrclib-xh_stlin.o xrclib-xh_sttxt.o xrclib-xh_text.o xrclib-xh_toolb.o xrclib-xh_tree.o xrclib-xh_unkwn.o xrclib-xh_wizrd.o xrclib-xmlrsall.o
+@COND_SHARED_0@	rm -f $@
+@COND_SHARED_0@	$(AR) rcu $@  xrclib-xmlparse.o xrclib-xmltok.o xrclib-xmlrole.o xrclib-xml.o xrclib-xmlres.o xrclib-xh_bmp.o xrclib-xh_bmpbt.o xrclib-xh_bttn.o xrclib-xh_cald.o xrclib-xh_chckb.o xrclib-xh_chckl.o xrclib-xh_choic.o xrclib-xh_combo.o xrclib-xh_dlg.o xrclib-xh_frame.o xrclib-xh_gauge.o xrclib-xh_gdctl.o xrclib-xh_html.o xrclib-xh_listb.o xrclib-xh_listc.o xrclib-xh_menu.o xrclib-xh_notbk.o xrclib-xh_panel.o xrclib-xh_radbt.o xrclib-xh_radbx.o xrclib-xh_scrol.o xrclib-xh_scwin.o xrclib-xh_sizer.o xrclib-xh_slidr.o xrclib-xh_spin.o xrclib-xh_split.o xrclib-xh_stbmp.o xrclib-xh_stbox.o xrclib-xh_stlin.o xrclib-xh_sttxt.o xrclib-xh_text.o xrclib-xh_toolb.o xrclib-xh_tree.o xrclib-xh_unkwn.o xrclib-xh_wizrd.o xrclib-xmlrsall.o
+@COND_SHARED_0@	$(RANLIB) $@
 
-xh_sttxt.o: $(srcdir)/xh_sttxt.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+xrclib-xh_radbx.o: $(srcdir)/xh_radbx.cpp
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib-xh_menu.o: $(srcdir)/xh_menu.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+xrcdll-xh_spin.o: $(srcdir)/xh_spin.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrclib-xh_text.o: $(srcdir)/xh_text.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+xrcdll-xh_slidr.o: $(srcdir)/xh_slidr.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xh_html.o: $(srcdir)/xh_html.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+xrclib-xh_text.o: $(srcdir)/xh_text.cpp
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib-xh_unkwn.o: $(srcdir)/xh_unkwn.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xh_gdctl.o: $(srcdir)/xh_gdctl.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+xrcdll-xh_radbx.o: $(srcdir)/xh_radbx.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrclib-xh_cald.o: $(srcdir)/xh_cald.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
-
-xrclib-xh_listb.o: $(srcdir)/xh_listb.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xh_split.o: $(srcdir)/xh_split.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+xrclib-xh_notbk.o: $(srcdir)/xh_notbk.cpp
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib-xh_spin.o: $(srcdir)/xh_spin.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xh_bmpbt.o: $(srcdir)/xh_bmpbt.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+xrcdll-xh_bmpbt.o: $(srcdir)/xh_bmpbt.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrclib-xmlparse.o: $(srcdir)/expat/xmlparse/xmlparse.c
-	$(CCC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS) $<
+	$(CCC) -c -o $@ $(XRCLIB_CFLAGS) $<
 
 xrclib-xh_bmpbt.o: $(srcdir)/xh_bmpbt.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib-xh_split.o: $(srcdir)/xh_split.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
-
-xh_bttn.o: $(srcdir)/xh_bttn.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xh_listc.o: $(srcdir)/xh_listc.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+xrcdll-xh_bmp.o: $(srcdir)/xh_bmp.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xmlrole.o: $(srcdir)/expat/xmltok/xmlrole.c
-	$(CCC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS) $(PIC_FLAG) $<
+xrcdll-xh_notbk.o: $(srcdir)/xh_notbk.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xh_scwin.o: $(srcdir)/xh_scwin.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+xrcdll-xh_gdctl.o: $(srcdir)/xh_gdctl.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xh_spin.o: $(srcdir)/xh_spin.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
-
-xh_stbox.o: $(srcdir)/xh_stbox.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+xrclib-xh_toolb.o: $(srcdir)/xh_toolb.cpp
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib-xh_frame.o: $(srcdir)/xh_frame.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib-xh_chckb.o: $(srcdir)/xh_chckb.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xh_choic.o: $(srcdir)/xh_choic.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+xrcdll-xh_stlin.o: $(srcdir)/xh_stlin.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xmlres.o: $(srcdir)/xmlres.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
-
-xh_dlg.o: $(srcdir)/xh_dlg.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
-
-xmltok.o: $(srcdir)/expat/xmltok/xmltok.c
-	$(CCC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS) $(PIC_FLAG) $<
+xrcdll-xh_wizrd.o: $(srcdir)/xh_wizrd.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrclib-xh_stbmp.o: $(srcdir)/xh_stbmp.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib-xh_wizrd.o: $(srcdir)/xh_wizrd.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
-
-xh_radbx.o: $(srcdir)/xh_radbx.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib-xh_panel.o: $(srcdir)/xh_panel.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
-
-xh_wizrd.o: $(srcdir)/xh_wizrd.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib-xmltok.o: $(srcdir)/expat/xmltok/xmltok.c
-	$(CCC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS) $<
+	$(CCC) -c -o $@ $(XRCLIB_CFLAGS) $<
 
-xh_combo.o: $(srcdir)/xh_combo.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+xrcdll-xh_scrol.o: $(srcdir)/xh_scrol.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-$(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3): xmlparse.o xmltok.o xmlrole.o xml.o xmlres.o xh_bmp.o xh_bmpbt.o xh_bttn.o xh_cald.o xh_chckb.o xh_chckl.o xh_choic.o xh_combo.o xh_dlg.o xh_frame.o xh_gauge.o xh_gdctl.o xh_html.o xh_listb.o xh_listc.o xh_menu.o xh_notbk.o xh_panel.o xh_radbt.o xh_radbx.o xh_scrol.o xh_scwin.o xh_sizer.o xh_slidr.o xh_spin.o xh_split.o xh_stbmp.o xh_stbox.o xh_stlin.o xh_sttxt.o xh_text.o xh_toolb.o xh_tree.o xh_unkwn.o xh_wizrd.o xmlrsall.o
-	$(SHARED_LD_CXX) $@  xmlparse.o xmltok.o xmlrole.o xml.o xmlres.o xh_bmp.o xh_bmpbt.o xh_bttn.o xh_cald.o xh_chckb.o xh_chckl.o xh_choic.o xh_combo.o xh_dlg.o xh_frame.o xh_gauge.o xh_gdctl.o xh_html.o xh_listb.o xh_listc.o xh_menu.o xh_notbk.o xh_panel.o xh_radbt.o xh_radbx.o xh_scrol.o xh_scwin.o xh_sizer.o xh_slidr.o xh_spin.o xh_split.o xh_stbmp.o xh_stbox.o xh_stlin.o xh_sttxt.o xh_text.o xh_toolb.o xh_tree.o xh_unkwn.o xh_wizrd.o xmlrsall.o  $(__xrcdll___importlib) -L$(top_builddir)lib $(__xrcdll___importlib) $(__xrcdll___macinstnamecmd) $(__xrcdll___soname_flags) $(__xrcdll___macver) $(__WXLIB_MONO_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__WXLIB_CORE_p) $(__WXLIB_HTML_p)
-	$(__xrcdll___so_symlinks_cmd)
+@COND_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3): xrcdll-xmlparse.o xrcdll-xmltok.o xrcdll-xmlrole.o xrcdll-xml.o xrcdll-xmlres.o xrcdll-xh_bmp.o xrcdll-xh_bmpbt.o xrcdll-xh_bttn.o xrcdll-xh_cald.o xrcdll-xh_chckb.o xrcdll-xh_chckl.o xrcdll-xh_choic.o xrcdll-xh_combo.o xrcdll-xh_dlg.o xrcdll-xh_frame.o xrcdll-xh_gauge.o xrcdll-xh_gdctl.o xrcdll-xh_html.o xrcdll-xh_listb.o xrcdll-xh_listc.o xrcdll-xh_menu.o xrcdll-xh_notbk.o xrcdll-xh_panel.o xrcdll-xh_radbt.o xrcdll-xh_radbx.o xrcdll-xh_scrol.o xrcdll-xh_scwin.o xrcdll-xh_sizer.o xrcdll-xh_slidr.o xrcdll-xh_spin.o xrcdll-xh_split.o xrcdll-xh_stbmp.o xrcdll-xh_stbox.o xrcdll-xh_stlin.o xrcdll-xh_sttxt.o xrcdll-xh_text.o xrcdll-xh_toolb.o xrcdll-xh_tree.o xrcdll-xh_unkwn.o xrcdll-xh_wizrd.o xrcdll-xmlrsall.o
+@COND_SHARED_1@	$(SHARED_LD_CXX) $@  xrcdll-xmlparse.o xrcdll-xmltok.o xrcdll-xmlrole.o xrcdll-xml.o xrcdll-xmlres.o xrcdll-xh_bmp.o xrcdll-xh_bmpbt.o xrcdll-xh_bttn.o xrcdll-xh_cald.o xrcdll-xh_chckb.o xrcdll-xh_chckl.o xrcdll-xh_choic.o xrcdll-xh_combo.o xrcdll-xh_dlg.o xrcdll-xh_frame.o xrcdll-xh_gauge.o xrcdll-xh_gdctl.o xrcdll-xh_html.o xrcdll-xh_listb.o xrcdll-xh_listc.o xrcdll-xh_menu.o xrcdll-xh_notbk.o xrcdll-xh_panel.o xrcdll-xh_radbt.o xrcdll-xh_radbx.o xrcdll-xh_scrol.o xrcdll-xh_scwin.o xrcdll-xh_sizer.o xrcdll-xh_slidr.o xrcdll-xh_spin.o xrcdll-xh_split.o xrcdll-xh_stbmp.o xrcdll-xh_stbox.o xrcdll-xh_stlin.o xrcdll-xh_sttxt.o xrcdll-xh_text.o xrcdll-xh_toolb.o xrcdll-xh_tree.o xrcdll-xh_unkwn.o xrcdll-xh_wizrd.o xrcdll-xmlrsall.o $(LDFLAGS) $(__xrcdll___importlib) -L$(top_builddir)lib $(__xrcdll___macinstnamecmd) $(__DEBUGFLAG_1)  $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(__xrcdll___macver)  $(__WXLIB_MONO_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__WXLIB_CORE_p) $(__WXLIB_HTML_p)
+@COND_SHARED_1@	$(__xrcdll___so_symlinks_cmd)
 
 xrclib-xh_slidr.o: $(srcdir)/xh_slidr.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+
+xrcdll-xh_listc.o: $(srcdir)/xh_listc.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrclib-xh_chckl.o: $(srcdir)/xh_chckl.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xh_text.o: $(srcdir)/xh_text.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+xrcdll-xmlres.o: $(srcdir)/xmlres.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrclib-xh_combo.o: $(srcdir)/xh_combo.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xh_sizer.o: $(srcdir)/xh_sizer.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+xrcdll-xh_stbox.o: $(srcdir)/xh_stbox.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xh_unkwn.o: $(srcdir)/xh_unkwn.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+xrcdll-xh_frame.o: $(srcdir)/xh_frame.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+
+xrcdll-xh_dlg.o: $(srcdir)/xh_dlg.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 install: all $(__install_xrcdll___depname) $(__install_xrclib___depname)
 	$(INSTALL_DIR) $(includedir)
@@ -299,123 +348,140 @@ distclean: clean
 	rm -f configure config.cache config.log config.status
 	rm -f bk-deps shared-ld-sh
 
-xh_tree.o: $(srcdir)/xh_tree.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+xrclib-xh_gauge.o: $(srcdir)/xh_gauge.cpp
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+
+xrcdll-xh_scwin.o: $(srcdir)/xh_scwin.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xh_stbmp.o: $(srcdir)/xh_stbmp.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+xrcdll-xh_chckb.o: $(srcdir)/xh_chckb.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrclib-xh_bttn.o: $(srcdir)/xh_bttn.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+
+xrcdll-xh_bttn.o: $(srcdir)/xh_bttn.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+
+xrcdll-xh_choic.o: $(srcdir)/xh_choic.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+
+xrcdll-xh_menu.o: $(srcdir)/xh_menu.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrclib-xh_tree.o: $(srcdir)/xh_tree.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-install_xrcdll: 
-	$(INSTALL_DIR) $(libdir)
-	$(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(libdir)
-	$(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3) $(libdir)
-	(cd $(libdir) ; $(__xrcdll___so_symlinks_inst_cmd))
+@COND_SHARED_1@install_xrcdll: 
+@COND_SHARED_1@	$(INSTALL_DIR) $(libdir)
+@COND_SHARED_1@	$(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(libdir)
+@COND_SHARED_1@	$(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) $(libdir)
+@COND_SHARED_1@	(cd $(libdir) ; $(__xrcdll___so_symlinks_inst_cmd))
 
-xrclib-xmlrole.o: $(srcdir)/expat/xmltok/xmlrole.c
-	$(CCC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CFLAGS) $<
+xrcdll-xml.o: $(srcdir)/xml.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xh_slidr.o: $(srcdir)/xh_slidr.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+xrclib-xmlrole.o: $(srcdir)/expat/xmltok/xmlrole.c
+	$(CCC) -c -o $@ $(XRCLIB_CFLAGS) $<
 
-xh_scrol.o: $(srcdir)/xh_scrol.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+xrcdll-xh_cald.o: $(srcdir)/xh_cald.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xh_cald.o: $(srcdir)/xh_cald.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+xrcdll-xh_text.o: $(srcdir)/xh_text.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrclib-xh_scwin.o: $(srcdir)/xh_scwin.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
-
-xh_gauge.o: $(srcdir)/xh_gauge.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib-xh_scrol.o: $(srcdir)/xh_scrol.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xh_bmp.o: $(srcdir)/xh_bmp.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
-
-xrclib-xh_radbx.o: $(srcdir)/xh_radbx.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+xrclib-xh_listc.o: $(srcdir)/xh_listc.cpp
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-install_xrclib: 
-	$(INSTALL_DIR) $(libdir)
-	$(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a $(libdir)
+xrcdll-xh_sizer.o: $(srcdir)/xh_sizer.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xh_menu.o: $(srcdir)/xh_menu.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+@COND_SHARED_0@install_xrclib: 
+@COND_SHARED_0@	$(INSTALL_DIR) $(libdir)
+@COND_SHARED_0@	$(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a $(libdir)
 
-xml.o: $(srcdir)/xml.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+xrcdll-xh_html.o: $(srcdir)/xh_html.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrclib-xh_toolb.o: $(srcdir)/xh_toolb.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+xrcdll-xmltok.o: $(srcdir)/expat/xmltok/xmltok.c
+	$(CCC) -c -o $@ $(XRCDLL_CFLAGS) $<
 
-xh_frame.o: $(srcdir)/xh_frame.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+clean: 
+	rm -rf ./.deps
+	rm -f -f ./*.o
+	rm -f $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3)
+	rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT)
+	rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2)
+	rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a
 
 xrclib-xh_choic.o: $(srcdir)/xh_choic.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib-xml.o: $(srcdir)/xml.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+
+xrcdll-xh_gauge.o: $(srcdir)/xh_gauge.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrclib-xh_bmp.o: $(srcdir)/xh_bmp.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xh_radbt.o: $(srcdir)/xh_radbt.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+xrcdll-xh_split.o: $(srcdir)/xh_split.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrclib-xh_stbox.o: $(srcdir)/xh_stbox.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xmlrsall.o: $(srcdir)/xmlrsall.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+xrcdll-xmlrsall.o: $(srcdir)/xmlrsall.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+
+xrclib-xh_stlin.o: $(srcdir)/xh_stlin.cpp
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib-xh_sizer.o: $(srcdir)/xh_sizer.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xh_panel.o: $(srcdir)/xh_panel.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+xrcdll-xh_sttxt.o: $(srcdir)/xh_sttxt.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrclib-xh_radbt.o: $(srcdir)/xh_radbt.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+xrcdll-xh_panel.o: $(srcdir)/xh_panel.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrclib-xh_gauge.o: $(srcdir)/xh_gauge.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+xrclib-xh_radbt.o: $(srcdir)/xh_radbt.cpp
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib-xmlrsall.o: $(srcdir)/xmlrsall.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib-xh_notbk.o: $(srcdir)/xh_notbk.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+xrcdll-xh_chckl.o: $(srcdir)/xh_chckl.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrclib-xh_dlg.o: $(srcdir)/xh_dlg.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+xrcdll-xh_unkwn.o: $(srcdir)/xh_unkwn.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-clean: 
-	rm -f ./*.o ./.deps/*
-	rm -f $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf3) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT)
-	rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)-2.5$(__xrcdll___targetsuf2)
-	rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5.a
+xrcdll-xh_listb.o: $(srcdir)/xh_listb.cpp
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrclib-xh_stlin.o: $(srcdir)/xh_stlin.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+xrclib-xh_listb.o: $(srcdir)/xh_listb.cpp
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+
+xrclib-xh_dlg.o: $(srcdir)/xh_dlg.cpp
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xh_chckb.o: $(srcdir)/xh_chckb.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+xrclib-xh_menu.o: $(srcdir)/xh_menu.cpp
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xh_chckl.o: $(srcdir)/xh_chckl.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../../include -I$(srcdir)/../../include -DWXMAKINGDLL -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $(PIC_FLAG) $<
+xrcdll-xmlrole.o: $(srcdir)/expat/xmltok/xmlrole.c
+	$(CCC) -c -o $@ $(XRCDLL_CFLAGS) $<
 
 xrclib-xmlres.o: $(srcdir)/xmlres.cpp
-	$(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) -I$(srcdir)/../../../include -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 uninstall: