]> git.saurik.com Git - wxWidgets.git/blobdiff - src/xrc/Makefile.in
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
extending calculation of visible region
[wxWidgets.git] / src / xrc / Makefile.in
diff --git a/src/xrc/Makefile.in b/src/xrc/Makefile.in
index 9a0e7a534abc5a70ab4beddb708411395afda49d..a712b86817825852a84be7e46738ca745cd74c51 100644 (file)
--- a/src/xrc/Makefile.in
+++ b/src/xrc/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.3 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -10,45 +10,47 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 INSTALL = @INSTALL@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 INSTALL = @INSTALL@
-AR = @AR@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-DLLPREFIX = @DLLPREFIX@
-EXTRALIBS = @EXTRALIBS@
-EXTRALIBS_GUI = @EXTRALIBS_GUI@
-EXTRALIBS_XML = @EXTRALIBS_XML@
-HOST_SUFFIX = @HOST_SUFFIX@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_DIR = @INSTALL_DIR@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-LDFLAGS = @LDFLAGS@
+SHARED_LD_CXX = @SHARED_LD_CXX@
 LIBPREFIX = @LIBPREFIX@
 LIBPREFIX = @LIBPREFIX@
+SO_SUFFIX = @SO_SUFFIX@
 LN_S = @LN_S@
 PIC_FLAG = @PIC_FLAG@
 LN_S = @LN_S@
 PIC_FLAG = @PIC_FLAG@
-RANLIB = @RANLIB@
-SHARED_LD_CXX = @SHARED_LD_CXX@
 SONAME_FLAG = @SONAME_FLAG@
 SONAME_FLAG = @SONAME_FLAG@
-SO_SUFFIX = @SO_SUFFIX@
 STRIP = @STRIP@
 STRIP = @STRIP@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_DIR = @INSTALL_DIR@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
+libdir = @libdir@
+includedir = @includedir@
+DLLPREFIX = @DLLPREFIX@
+AR = @AR@
+RANLIB = @RANLIB@
+CXX = @CXX@
+CXXFLAGS = @CXXFLAGS@
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+VENDOR = @VENDOR@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
-VENDOR = @VENDOR@
-includedir = @includedir@
-libdir = @libdir@
-srcdir = @srcdir@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
+EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_XML = @EXTRALIBS_XML@
+EXTRALIBS_HTML = @EXTRALIBS_HTML@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
+EXTRALIBS_SDL = @EXTRALIBS_SDL@
+HOST_SUFFIX = @HOST_SUFFIX@
 
 ### Variables: ###
 
 DESTDIR = 
 
 ### Variables: ###
 
 DESTDIR = 
-LIBDIRNAME = $(top_builddir)lib
 WX_VERSION = 2.5.1
 WX_VERSION = 2.5.1
-XRCDLL_CXXFLAGS = $(__xrcdll_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \
-       -DWXUSINGDLL -DWXMAKINGDLL_XRC $(CXXFLAGS) $(PIC_FLAG)
+LIBDIRNAME = $(top_builddir)lib
+XRCDLL_CXXFLAGS = $(__xrcdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       -I$(srcdir)/../../include -DWXUSINGDLL -DWXMAKINGDLL_XRC $(PIC_FLAG) \
+       $(CPPFLAGS) $(CXXFLAGS)
 XRCDLL_OBJECTS =  \
        xrcdll_xmlres.o \
        xrcdll_xh_bmp.o \
 XRCDLL_OBJECTS =  \
        xrcdll_xmlres.o \
        xrcdll_xh_bmp.o \
@@ -77,6 +79,7 @@ XRCDLL_OBJECTS =  \
        xrcdll_xh_slidr.o \
        xrcdll_xh_spin.o \
        xrcdll_xh_split.o \
        xrcdll_xh_slidr.o \
        xrcdll_xh_spin.o \
        xrcdll_xh_split.o \
+       xrcdll_xh_statbar.o \
        xrcdll_xh_stbmp.o \
        xrcdll_xh_stbox.o \
        xrcdll_xh_stlin.o \
        xrcdll_xh_stbmp.o \
        xrcdll_xh_stbox.o \
        xrcdll_xh_stlin.o \
@@ -87,9 +90,10 @@ XRCDLL_OBJECTS =  \
        xrcdll_xh_unkwn.o \
        xrcdll_xh_wizrd.o \
        xrcdll_xmlrsall.o
        xrcdll_xh_unkwn.o \
        xrcdll_xh_wizrd.o \
        xrcdll_xmlrsall.o
-XRCLIB_CXXFLAGS = $(__xrclib_PCH_INC) $(CPPFLAGS) -D__WX$(TOOLKIT)__ \
-       $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include -I$(srcdir)/../../include \
-       -I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CXXFLAGS)
+XRCDLL_ODEP =  $(___pch_wxprec_xrcdll_wx_wxprec_h_gch___depname)
+XRCLIB_CXXFLAGS = $(__xrclib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       -I$(srcdir)/../../include -I$(srcdir)/expat/xmlparse \
+       -I$(srcdir)/expat/xmltok $(CPPFLAGS) $(CXXFLAGS)
 XRCLIB_OBJECTS =  \
        xrclib_xmlres.o \
        xrclib_xh_bmp.o \
 XRCLIB_OBJECTS =  \
        xrclib_xmlres.o \
        xrclib_xh_bmp.o \
@@ -118,6 +122,7 @@ XRCLIB_OBJECTS =  \
        xrclib_xh_slidr.o \
        xrclib_xh_spin.o \
        xrclib_xh_split.o \
        xrclib_xh_slidr.o \
        xrclib_xh_spin.o \
        xrclib_xh_split.o \
+       xrclib_xh_statbar.o \
        xrclib_xh_stbmp.o \
        xrclib_xh_stbox.o \
        xrclib_xh_stlin.o \
        xrclib_xh_stbmp.o \
        xrclib_xh_stbox.o \
        xrclib_xh_stlin.o \
@@ -128,77 +133,58 @@ XRCLIB_OBJECTS =  \
        xrclib_xh_unkwn.o \
        xrclib_xh_wizrd.o \
        xrclib_xmlrsall.o
        xrclib_xh_unkwn.o \
        xrclib_xh_wizrd.o \
        xrclib_xmlrsall.o
+XRCLIB_ODEP =  $(___pch_wxprec_xrclib_wx_wxprec_h_gch___depname)
 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 
-@COND_DEPS_TRACKING_0@CXXC = $(CXX)
-@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
 @COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX)
 @COND_PLATFORM_WIN32_1@DLLIMPEXT = .a
 @COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX)
 @COND_PLATFORM_WIN32_1@DLLIMPEXT = .a
+@COND_DEPS_TRACKING_0@CXXC = $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
+@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
-@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = 
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
 @COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
+@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
+@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = 
 @COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
 @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
 @COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
 @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
+@COND_UNICODE_1@WXUNICODEFLAG = u
+@COND_WXUNIV_1@WXUNIVNAME = univ
 @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
 @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)251
 @COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5
 @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
 @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
 @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)251
 @COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -2.5
 @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
-@COND_UNICODE_1@WXUNICODEFLAG = u
-@COND_WXUNIV_1@WXUNIVNAME = univ
-@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
-@COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@      -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  = \
-@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \
-@COND_WXUSE_REGEX_BUILTIN@     -lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
-@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)
-@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
-@COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
-COND_MONOLITHIC_0___WXLIB_ADV_p = \
-       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
-@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
-@COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
-COND_MONOLITHIC_0___WXLIB_CORE_p = \
-       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
-COND_MONOLITHIC_0___WXLIB_HTML_p = \
-       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
-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_MONOLITHIC_0@__WXLIB_XML_p = \
-@COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)
-@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)
 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)
-COND_PLATFORM_WIN32_1___xrcdll___importlib = \
-       -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
-@COND_PLATFORM_WIN32_1@__xrcdll___importlib = $(COND_PLATFORM_WIN32_1___xrcdll___importlib)
+@COND_SHARED_1@__install_xrcdll___depname = install_xrcdll
 COND_PLATFORM_MACOSX_1___xrcdll___macinstnamecmd = -install_name \
        $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2)
 @COND_PLATFORM_MACOSX_1@__xrcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___xrcdll___macinstnamecmd)
 COND_PLATFORM_MACOSX_1___xrcdll___macinstnamecmd = -install_name \
        $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2)
 @COND_PLATFORM_MACOSX_1@__xrcdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___xrcdll___macinstnamecmd)
-@COND_PLATFORM_MACOSX_1@__xrcdll___macver = \
-@COND_PLATFORM_MACOSX_1@       -compatibility_version $(WX_VERSION) \
-@COND_PLATFORM_MACOSX_1@       -current_version $(WX_VERSION)
+COND_PLATFORM_WIN32_1___xrcdll___importlib = \
+       -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+@COND_PLATFORM_WIN32_1@__xrcdll___importlib = $(COND_PLATFORM_WIN32_1___xrcdll___importlib)
+@COND_GCC_PCH_1@__xrcdll_PCH_INC = -I.pch/wxprec_xrcdll
+@COND_GCC_PCH_1@___pch_wxprec_xrcdll_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@       = .pch/wxprec_xrcdll/wx/wxprec.h.gch
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__xrcdll___targetsuf2 \
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@       = .$(SO_SUFFIX).1
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__xrcdll___targetsuf2 \
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@       = .1.$(SO_SUFFIX)
+@COND_USE_SOVERSION_0@__xrcdll___targetsuf2 = .$(SO_SUFFIX)
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__xrcdll___targetsuf3 \
+@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@       = .$(SO_SUFFIX).1.0.0
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__xrcdll___targetsuf3 \
+@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@       = .1.0.0.$(SO_SUFFIX)
+@COND_USE_SOVERSION_0@__xrcdll___targetsuf3 = .$(SO_SUFFIX)
+COND_USE_SOVERLINUX_1___xrcdll___soname_flags = \
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2)
+@COND_USE_SOVERLINUX_1@__xrcdll___soname_flags = $(COND_USE_SOVERLINUX_1___xrcdll___soname_flags)
+COND_USE_SOVERSOLARIS_1___xrcdll___soname_flags = \
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3)
+@COND_USE_SOVERSOLARIS_1@__xrcdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___xrcdll___soname_flags)
 COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
        $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \
        $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \
 COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
        $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \
        $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \
@@ -219,37 +205,68 @@ COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_inst_cmd = rm -f \
        $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) \
        $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
 @COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_inst_cmd)
        $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) \
        $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
 @COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_inst_cmd)
-COND_USE_SOVERLINUX_1___xrcdll___soname_flags = \
-       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2)
-@COND_USE_SOVERLINUX_1@__xrcdll___soname_flags = $(COND_USE_SOVERLINUX_1___xrcdll___soname_flags)
-COND_USE_SOVERSOLARIS_1___xrcdll___soname_flags = \
-       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3)
-@COND_USE_SOVERSOLARIS_1@__xrcdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___xrcdll___soname_flags)
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__xrcdll___targetsuf2 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@       = .$(SO_SUFFIX).1
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__xrcdll___targetsuf2 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@       = .1.$(SO_SUFFIX)
-@COND_USE_SOVERSION_0@__xrcdll___targetsuf2 = .$(SO_SUFFIX)
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@__xrcdll___targetsuf3 \
-@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@       = .$(SO_SUFFIX).1.0.0
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@__xrcdll___targetsuf3 \
-@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@       = .1.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_PLATFORM_MACOSX_1@__xrcdll___macver = \
+@COND_PLATFORM_MACOSX_1@       -compatibility_version $(WX_VERSION) \
+@COND_PLATFORM_MACOSX_1@       -current_version $(WX_VERSION)
+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_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
+@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
+@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
+@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
+@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
+@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  = \
+@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@  -lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
+@COND_WXUSE_ZLIB_BUILTIN@      -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
+@COND_WXUSE_ODBC_BUILTIN@      -lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \
+@COND_WXUSE_REGEX_BUILTIN@     -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
+@COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
+COND_MONOLITHIC_0___WXLIB_HTML_p = \
+       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
+COND_MONOLITHIC_0___WXLIB_ADV_p = \
+       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+@COND_MONOLITHIC_0@__WXLIB_XML_p = \
+@COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
+@COND_MONOLITHIC_0@    -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 COND_SHARED_0___xrclib___depname = \
        $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a
 @COND_SHARED_0@__xrclib___depname = $(COND_SHARED_0___xrclib___depname)
 COND_SHARED_0___xrclib___depname = \
        $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a
 @COND_SHARED_0@__xrclib___depname = $(COND_SHARED_0___xrclib___depname)
+@COND_SHARED_0@__install_xrclib___depname = install_xrclib
+@COND_GCC_PCH_1@__xrclib_PCH_INC = -I.pch/wxprec_xrclib
+@COND_GCC_PCH_1@___pch_wxprec_xrclib_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@       = .pch/wxprec_xrclib/wx/wxprec.h.gch
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 
 ### Targets: ###
 
 all: $(__xrcdll___depname) $(__xrclib___depname)
 
 
 ### Targets: ###
 
 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)
+install: all $(__install_xrcdll___depname) $(__install_xrclib___depname)
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)
+       for f in wx/xrc/xmlres.h wx/xrc/xh_all.h wx/xrc/xh_bmp.h wx/xrc/xh_bmpbt.h wx/xrc/xh_bttn.h wx/xrc/xh_cald.h wx/xrc/xh_chckb.h wx/xrc/xh_chckl.h wx/xrc/xh_choic.h wx/xrc/xh_combo.h wx/xrc/xh_dlg.h wx/xrc/xh_frame.h wx/xrc/xh_gauge.h wx/xrc/xh_gdctl.h wx/xrc/xh_html.h wx/xrc/xh_listb.h wx/xrc/xh_listc.h wx/xrc/xh_menu.h wx/xrc/xh_notbk.h wx/xrc/xh_panel.h wx/xrc/xh_radbt.h wx/xrc/xh_radbx.h wx/xrc/xh_scrol.h wx/xrc/xh_scwin.h wx/xrc/xh_sizer.h wx/xrc/xh_slidr.h wx/xrc/xh_spin.h wx/xrc/xh_split.h wx/xrc/xh_statbar.h wx/xrc/xh_stbmp.h wx/xrc/xh_stbox.h wx/xrc/xh_stlin.h wx/xrc/xh_sttxt.h wx/xrc/xh_text.h wx/xrc/xh_toolb.h wx/xrc/xh_tree.h wx/xrc/xh_unkwn.h wx/xrc/xh_wizrd.h; do \
+       if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+       $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
+       fi; \
+       $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
+       done
 
 
-@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)
+uninstall: 
+
+install-strip: install
+       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3)
 
 clean: 
        rm -rf ./.deps ./.pch
 
 clean: 
        rm -rf ./.deps ./.pch
@@ -262,17 +279,10 @@ clean:
 distclean: clean
        rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 distclean: clean
        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) $(DESTDIR)$(includedir)
-       for f in wx/xrc/xmlres.h wx/xrc/xh_all.h wx/xrc/xh_bmp.h wx/xrc/xh_bmpbt.h wx/xrc/xh_bttn.h wx/xrc/xh_cald.h wx/xrc/xh_chckb.h wx/xrc/xh_chckl.h wx/xrc/xh_choic.h wx/xrc/xh_combo.h wx/xrc/xh_dlg.h wx/xrc/xh_frame.h wx/xrc/xh_gauge.h wx/xrc/xh_gdctl.h wx/xrc/xh_html.h wx/xrc/xh_listb.h wx/xrc/xh_listc.h wx/xrc/xh_menu.h wx/xrc/xh_notbk.h wx/xrc/xh_panel.h wx/xrc/xh_radbt.h wx/xrc/xh_radbx.h wx/xrc/xh_scrol.h wx/xrc/xh_scwin.h wx/xrc/xh_sizer.h wx/xrc/xh_slidr.h wx/xrc/xh_spin.h wx/xrc/xh_split.h wx/xrc/xh_stbmp.h wx/xrc/xh_stbox.h wx/xrc/xh_stlin.h wx/xrc/xh_sttxt.h wx/xrc/xh_text.h wx/xrc/xh_toolb.h wx/xrc/xh_tree.h wx/xrc/xh_unkwn.h wx/xrc/xh_wizrd.h; do \
-       if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
-       $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
-       fi; \
-       $(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
-       done
-
-install-strip: install
-       $(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3)
+@COND_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3): $(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) $(EXTRALIBS_HTML) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p)  $(__WXLIB_XML_p) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)
+@COND_SHARED_1@        
+@COND_SHARED_1@        $(__xrcdll___so_symlinks_cmd)
 
 @COND_SHARED_1@install_xrcdll: 
 @COND_SHARED_1@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
 
 @COND_SHARED_1@install_xrcdll: 
 @COND_SHARED_1@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
@@ -280,246 +290,251 @@ install-strip: install
 @COND_SHARED_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) $(DESTDIR)$(libdir)
 @COND_SHARED_1@        (cd $(DESTDIR)$(libdir) ; $(__xrcdll___so_symlinks_inst_cmd))
 
 @COND_SHARED_1@        $(INSTALL_PROGRAM) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) $(DESTDIR)$(libdir)
 @COND_SHARED_1@        (cd $(DESTDIR)$(libdir) ; $(__xrcdll___so_symlinks_inst_cmd))
 
+@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_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a: $(XRCLIB_OBJECTS)
+@COND_SHARED_0@        rm -f $@
+@COND_SHARED_0@        $(AR) rcu $@ $(XRCLIB_OBJECTS)
+@COND_SHARED_0@        $(RANLIB) $@
+
 @COND_SHARED_0@install_xrclib: 
 @COND_SHARED_0@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
 @COND_SHARED_0@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
 @COND_SHARED_0@install_xrclib: 
 @COND_SHARED_0@        $(INSTALL_DIR) $(DESTDIR)$(libdir)
 @COND_SHARED_0@        $(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a $(DESTDIR)$(libdir)
 
-uninstall: 
+@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)
 
 
-@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) $(EXTRALIBS_XML) $(__WXLIB_BASE_p)
-@COND_SHARED_1@        
-@COND_SHARED_1@        $(__xrcdll___so_symlinks_cmd)
+xrcdll_xmlres.o: $(srcdir)/xmlres.cpp $(XRCDLL_ODEP)
+       $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 
-xrcdll_xh_bmp.o: $(srcdir)/xh_bmp.cpp
+xrcdll_xh_bmp.o: $(srcdir)/xh_bmp.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_bmpbt.o: $(srcdir)/xh_bmpbt.cpp
+xrcdll_xh_bmpbt.o: $(srcdir)/xh_bmpbt.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_bttn.o: $(srcdir)/xh_bttn.cpp
+xrcdll_xh_bttn.o: $(srcdir)/xh_bttn.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_cald.o: $(srcdir)/xh_cald.cpp
+xrcdll_xh_cald.o: $(srcdir)/xh_cald.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_chckb.o: $(srcdir)/xh_chckb.cpp
+xrcdll_xh_chckb.o: $(srcdir)/xh_chckb.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_chckl.o: $(srcdir)/xh_chckl.cpp
+xrcdll_xh_chckl.o: $(srcdir)/xh_chckl.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_choic.o: $(srcdir)/xh_choic.cpp
+xrcdll_xh_choic.o: $(srcdir)/xh_choic.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_combo.o: $(srcdir)/xh_combo.cpp
+xrcdll_xh_combo.o: $(srcdir)/xh_combo.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_dlg.o: $(srcdir)/xh_dlg.cpp
+xrcdll_xh_dlg.o: $(srcdir)/xh_dlg.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_frame.o: $(srcdir)/xh_frame.cpp
+xrcdll_xh_frame.o: $(srcdir)/xh_frame.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_gauge.o: $(srcdir)/xh_gauge.cpp
+xrcdll_xh_gauge.o: $(srcdir)/xh_gauge.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_gdctl.o: $(srcdir)/xh_gdctl.cpp
+xrcdll_xh_gdctl.o: $(srcdir)/xh_gdctl.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_html.o: $(srcdir)/xh_html.cpp
+xrcdll_xh_html.o: $(srcdir)/xh_html.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_listb.o: $(srcdir)/xh_listb.cpp
+xrcdll_xh_listb.o: $(srcdir)/xh_listb.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_listc.o: $(srcdir)/xh_listc.cpp
+xrcdll_xh_listc.o: $(srcdir)/xh_listc.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_menu.o: $(srcdir)/xh_menu.cpp
+xrcdll_xh_menu.o: $(srcdir)/xh_menu.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_notbk.o: $(srcdir)/xh_notbk.cpp
+xrcdll_xh_notbk.o: $(srcdir)/xh_notbk.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_panel.o: $(srcdir)/xh_panel.cpp
+xrcdll_xh_panel.o: $(srcdir)/xh_panel.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_radbt.o: $(srcdir)/xh_radbt.cpp
+xrcdll_xh_radbt.o: $(srcdir)/xh_radbt.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_radbx.o: $(srcdir)/xh_radbx.cpp
+xrcdll_xh_radbx.o: $(srcdir)/xh_radbx.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_scrol.o: $(srcdir)/xh_scrol.cpp
+xrcdll_xh_scrol.o: $(srcdir)/xh_scrol.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_scwin.o: $(srcdir)/xh_scwin.cpp
+xrcdll_xh_scwin.o: $(srcdir)/xh_scwin.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_sizer.o: $(srcdir)/xh_sizer.cpp
+xrcdll_xh_sizer.o: $(srcdir)/xh_sizer.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_slidr.o: $(srcdir)/xh_slidr.cpp
+xrcdll_xh_slidr.o: $(srcdir)/xh_slidr.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_spin.o: $(srcdir)/xh_spin.cpp
+xrcdll_xh_spin.o: $(srcdir)/xh_spin.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_split.o: $(srcdir)/xh_split.cpp
+xrcdll_xh_split.o: $(srcdir)/xh_split.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_stbmp.o: $(srcdir)/xh_stbmp.cpp
+xrcdll_xh_statbar.o: $(srcdir)/xh_statbar.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_stbox.o: $(srcdir)/xh_stbox.cpp
+xrcdll_xh_stbmp.o: $(srcdir)/xh_stbmp.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_stlin.o: $(srcdir)/xh_stlin.cpp
+xrcdll_xh_stbox.o: $(srcdir)/xh_stbox.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_sttxt.o: $(srcdir)/xh_sttxt.cpp
+xrcdll_xh_stlin.o: $(srcdir)/xh_stlin.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_text.o: $(srcdir)/xh_text.cpp
+xrcdll_xh_sttxt.o: $(srcdir)/xh_sttxt.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_toolb.o: $(srcdir)/xh_toolb.cpp
+xrcdll_xh_text.o: $(srcdir)/xh_text.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_tree.o: $(srcdir)/xh_tree.cpp
+xrcdll_xh_toolb.o: $(srcdir)/xh_toolb.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_unkwn.o: $(srcdir)/xh_unkwn.cpp
+xrcdll_xh_tree.o: $(srcdir)/xh_tree.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xh_wizrd.o: $(srcdir)/xh_wizrd.cpp
+xrcdll_xh_unkwn.o: $(srcdir)/xh_unkwn.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xmlres.o: $(srcdir)/xmlres.cpp
+xrcdll_xh_wizrd.o: $(srcdir)/xh_wizrd.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-xrcdll_xmlrsall.o: $(srcdir)/xmlrsall.cpp
+xrcdll_xmlrsall.o: $(srcdir)/xmlrsall.cpp $(XRCDLL_ODEP)
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-@COND_SHARED_0@$(LIBDIRNAME)/$(LIBPREFIX)wx_$(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) $@
+xrclib_xmlres.o: $(srcdir)/xmlres.cpp $(XRCLIB_ODEP)
+       $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 
-xrclib_xh_bmp.o: $(srcdir)/xh_bmp.cpp
+xrclib_xh_bmp.o: $(srcdir)/xh_bmp.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_bmpbt.o: $(srcdir)/xh_bmpbt.cpp
+xrclib_xh_bmpbt.o: $(srcdir)/xh_bmpbt.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_bttn.o: $(srcdir)/xh_bttn.cpp
+xrclib_xh_bttn.o: $(srcdir)/xh_bttn.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_cald.o: $(srcdir)/xh_cald.cpp
+xrclib_xh_cald.o: $(srcdir)/xh_cald.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_chckb.o: $(srcdir)/xh_chckb.cpp
+xrclib_xh_chckb.o: $(srcdir)/xh_chckb.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_chckl.o: $(srcdir)/xh_chckl.cpp
+xrclib_xh_chckl.o: $(srcdir)/xh_chckl.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_choic.o: $(srcdir)/xh_choic.cpp
+xrclib_xh_choic.o: $(srcdir)/xh_choic.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_combo.o: $(srcdir)/xh_combo.cpp
+xrclib_xh_combo.o: $(srcdir)/xh_combo.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_dlg.o: $(srcdir)/xh_dlg.cpp
+xrclib_xh_dlg.o: $(srcdir)/xh_dlg.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_frame.o: $(srcdir)/xh_frame.cpp
+xrclib_xh_frame.o: $(srcdir)/xh_frame.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_gauge.o: $(srcdir)/xh_gauge.cpp
+xrclib_xh_gauge.o: $(srcdir)/xh_gauge.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_gdctl.o: $(srcdir)/xh_gdctl.cpp
+xrclib_xh_gdctl.o: $(srcdir)/xh_gdctl.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_html.o: $(srcdir)/xh_html.cpp
+xrclib_xh_html.o: $(srcdir)/xh_html.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_listb.o: $(srcdir)/xh_listb.cpp
+xrclib_xh_listb.o: $(srcdir)/xh_listb.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_listc.o: $(srcdir)/xh_listc.cpp
+xrclib_xh_listc.o: $(srcdir)/xh_listc.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_menu.o: $(srcdir)/xh_menu.cpp
+xrclib_xh_menu.o: $(srcdir)/xh_menu.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_notbk.o: $(srcdir)/xh_notbk.cpp
+xrclib_xh_notbk.o: $(srcdir)/xh_notbk.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_panel.o: $(srcdir)/xh_panel.cpp
+xrclib_xh_panel.o: $(srcdir)/xh_panel.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_radbt.o: $(srcdir)/xh_radbt.cpp
+xrclib_xh_radbt.o: $(srcdir)/xh_radbt.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_radbx.o: $(srcdir)/xh_radbx.cpp
+xrclib_xh_radbx.o: $(srcdir)/xh_radbx.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_scrol.o: $(srcdir)/xh_scrol.cpp
+xrclib_xh_scrol.o: $(srcdir)/xh_scrol.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_scwin.o: $(srcdir)/xh_scwin.cpp
+xrclib_xh_scwin.o: $(srcdir)/xh_scwin.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_sizer.o: $(srcdir)/xh_sizer.cpp
+xrclib_xh_sizer.o: $(srcdir)/xh_sizer.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_slidr.o: $(srcdir)/xh_slidr.cpp
+xrclib_xh_slidr.o: $(srcdir)/xh_slidr.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_spin.o: $(srcdir)/xh_spin.cpp
+xrclib_xh_spin.o: $(srcdir)/xh_spin.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_split.o: $(srcdir)/xh_split.cpp
+xrclib_xh_split.o: $(srcdir)/xh_split.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_stbmp.o: $(srcdir)/xh_stbmp.cpp
+xrclib_xh_statbar.o: $(srcdir)/xh_statbar.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_stbox.o: $(srcdir)/xh_stbox.cpp
+xrclib_xh_stbmp.o: $(srcdir)/xh_stbmp.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_stlin.o: $(srcdir)/xh_stlin.cpp
+xrclib_xh_stbox.o: $(srcdir)/xh_stbox.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_sttxt.o: $(srcdir)/xh_sttxt.cpp
+xrclib_xh_stlin.o: $(srcdir)/xh_stlin.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_text.o: $(srcdir)/xh_text.cpp
+xrclib_xh_sttxt.o: $(srcdir)/xh_sttxt.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_toolb.o: $(srcdir)/xh_toolb.cpp
+xrclib_xh_text.o: $(srcdir)/xh_text.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_tree.o: $(srcdir)/xh_tree.cpp
+xrclib_xh_toolb.o: $(srcdir)/xh_toolb.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_unkwn.o: $(srcdir)/xh_unkwn.cpp
+xrclib_xh_tree.o: $(srcdir)/xh_tree.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xh_wizrd.o: $(srcdir)/xh_wizrd.cpp
+xrclib_xh_unkwn.o: $(srcdir)/xh_unkwn.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xmlres.o: $(srcdir)/xmlres.cpp
+xrclib_xh_wizrd.o: $(srcdir)/xh_wizrd.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
-xrclib_xmlrsall.o: $(srcdir)/xmlrsall.cpp
+xrclib_xmlrsall.o: $(srcdir)/xmlrsall.cpp $(XRCLIB_ODEP)
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
        $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
-.PHONY: all clean distclean install install_xrcdll install_xrclib uninstall
+.PHONY: all install uninstall clean distclean install_xrcdll install_xrclib
wxWidgets (Impactor)