X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8f60bac1ab18be00b4e433f5db7b0261c5f17da..ddc8d969f8c7572649eb7bf4c84ec67e286ad4b0:/contrib/src/xrc/Makefile.in?ds=sidebyside

diff --git a/contrib/src/xrc/Makefile.in b/contrib/src/xrc/Makefile.in
index 67bfce2c55..d465acab5c 100644
--- a/contrib/src/xrc/Makefile.in
+++ b/contrib/src/xrc/Makefile.in
@@ -14,10 +14,17 @@ AR = @AR@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
+DLLPREFIX = @DLLPREFIX@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
+EXTRALIBS_HTML = @EXTRALIBS_HTML@
+EXTRALIBS_XML = @EXTRALIBS_XML@
 HOST_SUFFIX = @HOST_SUFFIX@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_DIR = @INSTALL_DIR@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 LDFLAGS = @LDFLAGS@
+LIBPREFIX = @LIBPREFIX@
 LN_S = @LN_S@
 PIC_FLAG = @PIC_FLAG@
 RANLIB = @RANLIB@
@@ -37,11 +44,12 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
+DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-WX_VERSION = 2.5.0
-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)
+WX_VERSION = 2.5.1
+XRCDLL_CXXFLAGS = $(__xrcdll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	-I$(top_srcdir)/include -I$(srcdir)/../../include -DWXUSINGDLL \
+	-DWXMAKINGDLL_XRC $(PIC_FLAG) $(CPPFLAGS) $(CXXFLAGS)
 XRCDLL_OBJECTS =  \
 	xrcdll_xmlres.o \
 	xrcdll_xh_bmp.o \
@@ -80,9 +88,9 @@ XRCDLL_OBJECTS =  \
 	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)
+XRCLIB_CXXFLAGS = $(__xrclib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	-I$(top_srcdir)/include -I$(srcdir)/../../include \
+	-I$(srcdir)/expat/xmlparse -I$(srcdir)/expat/xmltok $(CPPFLAGS) $(CXXFLAGS)
 XRCLIB_OBJECTS =  \
 	xrclib_xmlres.o \
 	xrclib_xh_bmp.o \
@@ -124,6 +132,10 @@ XRCLIB_OBJECTS =  \
 
 ### 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_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
@@ -133,7 +145,7 @@ XRCLIB_OBJECTS =  \
 @COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
 @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
 @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
-@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = wx$(PORTNAME)$(WXUNIVNAME)250
+@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
@@ -177,57 +189,57 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @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)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3)
+	$(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)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).$(SO_SUFFIX)
+	-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_PLATFORM_MACOSX_1___xrcdll___macinstnamecmd = -install_name \
-	$(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2)
+	$(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_USE_SOSYMLINKS_1___xrcdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
-	libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \
-	lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \
+	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \
+	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \
 	$(LN_S) \
-	lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) \
-	lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \
+	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) \
+	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \
 	$(LN_S) \
-	lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) \
-	libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).$(SO_SUFFIX))
+	$(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_cmd = $(COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_cmd)
 COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_inst_cmd = rm -f \
-	libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) \
-	lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \
+	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \
+	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \
 	$(LN_S) \
-	lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) \
-	lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \
+	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) \
+	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2); \
 	$(LN_S) \
-	lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2) \
-	libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).$(SO_SUFFIX)
+	$(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)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2)
+	$(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)lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3)
+	$(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).0
+@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@	= .0.$(SO_SUFFIX)
+@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).0.0.0
+@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@	= .0.0.0.$(SO_SUFFIX)
+@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_SHARED_0___xrclib___depname = \
-	$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a
+	$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a
 @COND_SHARED_0@__xrclib___depname = $(COND_SHARED_0___xrclib___depname)
 
 ### Targets: ###
@@ -243,268 +255,269 @@ all: $(__xrcdll___depname) $(__xrclib___depname)
 clean: 
 	rm -rf ./.deps ./.pch
 	rm -f ./*.o
-	rm -f $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3)
-	rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).$(SO_SUFFIX)
-	rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2)
-	rm -f $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a
+	rm -f $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3)
+	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf2)
+	rm -f $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a
 
 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) -d $(includedir)
+	$(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 $(includedir)/`dirname $$f` ; then \
-	$(INSTALL) -d $(includedir)/`dirname $$f`; \
+	if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \
+	$(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \
 	fi; \
-	$(INSTALL) -m 644 $(srcdir)/../../include//$$f $(includedir)/$$f; \
+	$(INSTALL_DATA) $(srcdir)/../../include//$$f $(DESTDIR)$(includedir)/$$f; \
 	done
 
 install-strip: install
-	$(STRIP) $(libdir)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3)
+	$(STRIP) $(DESTDIR)$(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3)
 
 @COND_SHARED_1@install_xrcdll: 
-@COND_SHARED_1@	$(INSTALL) -d $(libdir)
-@COND_SHARED_1@	$(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).$(SO_SUFFIX) $(libdir)
-@COND_SHARED_1@	install -c $(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3) $(libdir)
-@COND_SHARED_1@	(cd $(libdir) ; $(__xrcdll___so_symlinks_inst_cmd))
+@COND_SHARED_1@	$(INSTALL_DIR) $(DESTDIR)$(libdir)
+@COND_SHARED_1@	$(INSTALL_DATA) $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(DESTDIR)$(libdir)
+@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_0@install_xrclib: 
-@COND_SHARED_0@	$(INSTALL) -d $(libdir)
-@COND_SHARED_0@	$(INSTALL) -m 644 $(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a $(libdir)
+@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_SHARED_1@$(LIBDIRNAME)/lib$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(__xrcdll___targetsuf3): $(__xrcdll_PCH_DEP)  $(XRCDLL_OBJECTS)
-@COND_SHARED_1@	$(SHARED_LD_CXX) $@ $(XRCDLL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(__xrcdll___macinstnamecmd) $(__xrcdll___importlib) $(__xrcdll___soname_flags) $(__xrcdll___macver)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p)
+@COND_SHARED_1@$(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) $(EXTRALIBS_HTML) $(__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_xh_bmp.o: $(srcdir)/xh_bmp.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_bmpbt.o: $(srcdir)/xh_bmpbt.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_bttn.o: $(srcdir)/xh_bttn.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_cald.o: $(srcdir)/xh_cald.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_chckb.o: $(srcdir)/xh_chckb.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_chckl.o: $(srcdir)/xh_chckl.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_choic.o: $(srcdir)/xh_choic.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_combo.o: $(srcdir)/xh_combo.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_dlg.o: $(srcdir)/xh_dlg.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_frame.o: $(srcdir)/xh_frame.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_gauge.o: $(srcdir)/xh_gauge.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_gdctl.o: $(srcdir)/xh_gdctl.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_html.o: $(srcdir)/xh_html.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_listb.o: $(srcdir)/xh_listb.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_listc.o: $(srcdir)/xh_listc.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_menu.o: $(srcdir)/xh_menu.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_notbk.o: $(srcdir)/xh_notbk.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_panel.o: $(srcdir)/xh_panel.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_radbt.o: $(srcdir)/xh_radbt.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_radbx.o: $(srcdir)/xh_radbx.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_scrol.o: $(srcdir)/xh_scrol.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_scwin.o: $(srcdir)/xh_scwin.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_sizer.o: $(srcdir)/xh_sizer.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_slidr.o: $(srcdir)/xh_slidr.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_spin.o: $(srcdir)/xh_spin.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_split.o: $(srcdir)/xh_split.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_stbmp.o: $(srcdir)/xh_stbmp.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_stbox.o: $(srcdir)/xh_stbox.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_stlin.o: $(srcdir)/xh_stlin.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_sttxt.o: $(srcdir)/xh_sttxt.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_text.o: $(srcdir)/xh_text.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_toolb.o: $(srcdir)/xh_toolb.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_tree.o: $(srcdir)/xh_tree.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_unkwn.o: $(srcdir)/xh_unkwn.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xh_wizrd.o: $(srcdir)/xh_wizrd.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xmlres.o: $(srcdir)/xmlres.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
 xrcdll_xmlrsall.o: $(srcdir)/xmlrsall.cpp
-	$(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $<
 
-@COND_SHARED_0@$(LIBDIRNAME)/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc-2.5$(HOST_SUFFIX).a: $(__xrclib_PCH_DEP)  $(XRCLIB_OBJECTS)
+@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_xh_bmp.o: $(srcdir)/xh_bmp.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_bmpbt.o: $(srcdir)/xh_bmpbt.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_bttn.o: $(srcdir)/xh_bttn.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_cald.o: $(srcdir)/xh_cald.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_chckb.o: $(srcdir)/xh_chckb.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_chckl.o: $(srcdir)/xh_chckl.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_choic.o: $(srcdir)/xh_choic.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_combo.o: $(srcdir)/xh_combo.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_dlg.o: $(srcdir)/xh_dlg.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_frame.o: $(srcdir)/xh_frame.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_gauge.o: $(srcdir)/xh_gauge.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_gdctl.o: $(srcdir)/xh_gdctl.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_html.o: $(srcdir)/xh_html.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_listb.o: $(srcdir)/xh_listb.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_listc.o: $(srcdir)/xh_listc.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_menu.o: $(srcdir)/xh_menu.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_notbk.o: $(srcdir)/xh_notbk.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_panel.o: $(srcdir)/xh_panel.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_radbt.o: $(srcdir)/xh_radbt.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_radbx.o: $(srcdir)/xh_radbx.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_scrol.o: $(srcdir)/xh_scrol.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_scwin.o: $(srcdir)/xh_scwin.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_sizer.o: $(srcdir)/xh_sizer.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_slidr.o: $(srcdir)/xh_slidr.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_spin.o: $(srcdir)/xh_spin.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_split.o: $(srcdir)/xh_split.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_stbmp.o: $(srcdir)/xh_stbmp.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_stbox.o: $(srcdir)/xh_stbox.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_stlin.o: $(srcdir)/xh_stlin.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_sttxt.o: $(srcdir)/xh_sttxt.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_text.o: $(srcdir)/xh_text.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_toolb.o: $(srcdir)/xh_toolb.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_tree.o: $(srcdir)/xh_tree.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_unkwn.o: $(srcdir)/xh_unkwn.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xh_wizrd.o: $(srcdir)/xh_wizrd.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xmlres.o: $(srcdir)/xmlres.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 xrclib_xmlrsall.o: $(srcdir)/xmlrsall.cpp
-	$(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $<
 
 
 # Include dependency info, if present: