fixed bakefile so that in-tree headers take precedence over system-installed ones

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

contrib/utils/convertrc/Makefile.in

@@ -37,9 +37,10 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
-CONVERTRC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+CONVERTRC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-	-I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CXXFLAGS)
+	-I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CPPFLAGS) \
+	$(CXXFLAGS)
 CONVERTRC_OBJECTS =  \
 	$(__convertrc_os2_lib_res) \
 	convertrc_convert.o \

contrib/utils/wxrc/Makefile.in

@@ -35,8 +35,8 @@ top_srcdir = @top_srcdir@
 
 DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-WXRC_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-	-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS)
+WXRC_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) $(CPPFLAGS) $(CXXFLAGS)
 WXRC_OBJECTS =  \
 	wxrc_wxrc.o
 

contrib/utils/wxrcedit/Makefile.in

@@ -40,9 +40,10 @@ top_srcdir = @top_srcdir@
 
 DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-WXRCEDIT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+WXRCEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-	-I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CXXFLAGS)
+	-I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CPPFLAGS) \
+	$(CXXFLAGS)
 WXRCEDIT_OBJECTS =  \
 	$(__wxrcedit_os2_lib_res) \
 	wxrcedit_edapp.o \