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
2003-10-07 21:37:54 +00:00
parent 4bc89de684
commit e1a098d1ec
135 changed files with 457 additions and 444 deletions
--- a/contrib/samples/animate/Makefile.in
+++ b/contrib/samples/animate/Makefile.in
@@ -34,9 +34,10 @@ top_srcdir = @top_srcdir@

 ### Variables: ###

-ANITEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ANITEST_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)
 ANITEST_OBJECTS =  \
 	$(__anitest_os2_lib_res) \
 	anitest_anitest.o \
--- a/contrib/samples/deprecated/proplist/Makefile.in
+++ b/contrib/samples/deprecated/proplist/Makefile.in
@@ -36,9 +36,10 @@ top_srcdir = @top_srcdir@

 DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-PROPLIST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+PROPLIST_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)
 PROPLIST_OBJECTS =  \
 	$(__proplist_os2_lib_res) \
 	proplist_proplist.o \
--- a/contrib/samples/deprecated/resource/Makefile.in
+++ b/contrib/samples/deprecated/resource/Makefile.in
@@ -36,9 +36,10 @@ top_srcdir = @top_srcdir@

 DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-RESOURCE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+RESOURCE_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)
 RESOURCE_OBJECTS =  \
 	$(__resource_os2_lib_res) \
 	resource_resource.o \
--- a/contrib/samples/deprecated/treelay/Makefile.in
+++ b/contrib/samples/deprecated/treelay/Makefile.in
@@ -36,9 +36,10 @@ top_srcdir = @top_srcdir@

 DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-TREELAY_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+TREELAY_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)
 TREELAY_OBJECTS =  \
 	$(__treelay_os2_lib_res) \
 	treelay_treelay.o \
--- a/contrib/samples/fl/Makefile.in
+++ b/contrib/samples/fl/Makefile.in
@@ -35,42 +35,42 @@ top_srcdir = @top_srcdir@
 ### Variables: ###

 DESTDIR = 
-FL_DEMO1_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+FL_DEMO1_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
 	-I$(srcdir)/../../../samples -I$(srcdir)/../../include \
-	-DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
+	-DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) $(CXXFLAGS)
 FL_DEMO1_OBJECTS =  \
 	$(__fl) \
 	fl_demo1_fl_demo1.o \
 	$(__fl_demo1___win32rc)
-FL_DEMO2_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+FL_DEMO2_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
 	-I$(srcdir)/../../../samples -I$(srcdir)/../../include \
-	-DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
+	-DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) $(CXXFLAGS)
 FL_DEMO2_OBJECTS =  \
 	$(__fl) \
 	fl_demo2_fl_demo2.o \
 	$(__fl_demo2___win32rc)
-FL_SAMPLE1_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+FL_SAMPLE1_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
 	-I$(srcdir)/../../../samples -I$(srcdir)/../../include \
-	-DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
+	-DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) $(CXXFLAGS)
 FL_SAMPLE1_OBJECTS =  \
 	$(__fl) \
 	fl_sample1_fl_sample1.o \
 	$(__fl_sample1___win32rc)
-FL_SAMPLE2_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+FL_SAMPLE2_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
 	-I$(srcdir)/../../../samples -I$(srcdir)/../../include \
-	-DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
+	-DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) $(CXXFLAGS)
 FL_SAMPLE2_OBJECTS =  \
 	$(__fl) \
 	fl_sample2_fl_sample2.o \
 	$(__fl_sample2___win32rc)
-FL_SAMPLE3_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+FL_SAMPLE3_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
 	-I$(srcdir)/../../../samples -I$(srcdir)/../../include \
-	-DBMP_DIR=\"bitmaps/\" $(CXXFLAGS)
+	-DBMP_DIR=\"bitmaps/\" $(CPPFLAGS) $(CXXFLAGS)
 FL_SAMPLE3_OBJECTS =  \
 	$(__fl) \
 	fl_sample3_fl_sample3.o \
--- a/contrib/samples/gizmos/dynsash/Makefile.in
+++ b/contrib/samples/gizmos/dynsash/Makefile.in
@@ -36,9 +36,10 @@ top_srcdir = @top_srcdir@
 ### Variables: ###

 DESTDIR = 
-DYNSASH_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+DYNSASH_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)
 DYNSASH_OBJECTS =  \
 	$(__dynsash___win32rc) \
 	$(__dynsash_os2_lib_res) \
--- a/contrib/samples/gizmos/dynsash_switch/Makefile.in
+++ b/contrib/samples/gizmos/dynsash_switch/Makefile.in
@@ -35,9 +35,10 @@ top_srcdir = @top_srcdir@
 ### Variables: ###

 DESTDIR = 
-DYNSASH_SWITCH_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+DYNSASH_SWITCH_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)
 DYNSASH_SWITCH_OBJECTS =  \
 	$(__dynsash_switch___win32rc) \
 	$(__dynsash_switch_os2_lib_res) \
--- a/contrib/samples/gizmos/editlbox/Makefile.in
+++ b/contrib/samples/gizmos/editlbox/Makefile.in
@@ -36,9 +36,10 @@ top_srcdir = @top_srcdir@

 DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-TEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+TEST_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)
 TEST_OBJECTS =  \
 	$(__test___win32rc) \
 	$(__test_os2_lib_res) \
--- a/contrib/samples/gizmos/led/Makefile.in
+++ b/contrib/samples/gizmos/led/Makefile.in
@@ -35,9 +35,9 @@ top_srcdir = @top_srcdir@
 ### Variables: ###

 DESTDIR = 
-LED_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-	-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-	-I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CXXFLAGS)
+LED_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include \
+	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
+	-I$(srcdir)/../../../include $(CPPFLAGS) $(CXXFLAGS)
 LED_OBJECTS =  \
 	$(__led___win32rc) \
 	$(__led_os2_lib_res) \
--- a/contrib/samples/gizmos/multicell/Makefile.in
+++ b/contrib/samples/gizmos/multicell/Makefile.in
@@ -36,9 +36,10 @@ top_srcdir = @top_srcdir@

 DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-MTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+MTEST_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)
 MTEST_OBJECTS =  \
 	$(__mtest___win32rc) \
 	$(__mtest_os2_lib_res) \
--- a/contrib/samples/gizmos/splittree/Makefile.in
+++ b/contrib/samples/gizmos/splittree/Makefile.in
@@ -36,9 +36,10 @@ top_srcdir = @top_srcdir@

 DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-SPLITTREE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+SPLITTREE_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)
 SPLITTREE_OBJECTS =  \
 	$(__splittree___win32rc) \
 	$(__splittree_os2_lib_res) \
--- a/contrib/samples/mmedia/Makefile.in
+++ b/contrib/samples/mmedia/Makefile.in
@@ -37,9 +37,10 @@ top_srcdir = @top_srcdir@

 DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-MMBOARD_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+MMBOARD_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)
 MMBOARD_OBJECTS =  \
 	$(__mmboard_os2_lib_res) \
 	mmboard_mmboard.o \
--- a/contrib/samples/ogl/ogledit/Makefile.in
+++ b/contrib/samples/ogl/ogledit/Makefile.in
@@ -36,9 +36,10 @@ top_srcdir = @top_srcdir@

 DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-OGLEDIT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+OGLEDIT_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)
 OGLEDIT_OBJECTS =  \
 	$(__ogledit_os2_lib_res) \
 	ogledit_ogledit.o \
--- a/contrib/samples/ogl/studio/Makefile.in
+++ b/contrib/samples/ogl/studio/Makefile.in
@@ -37,9 +37,10 @@ top_srcdir = @top_srcdir@

 DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-STUDIO_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+STUDIO_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)
 STUDIO_OBJECTS =  \
 	$(__studio_os2_lib_res) \
 	studio_studio.o \
--- a/contrib/samples/plot/Makefile.in
+++ b/contrib/samples/plot/Makefile.in
@@ -36,9 +36,10 @@ top_srcdir = @top_srcdir@

 DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-PLOT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+PLOT_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)
 PLOT_OBJECTS =  \
 	$(__plot_os2_lib_res) \
 	plot_plot.o \
--- a/contrib/samples/stc/Makefile.in
+++ b/contrib/samples/stc/Makefile.in
@@ -36,9 +36,10 @@ top_srcdir = @top_srcdir@

 DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-STCTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+STCTEST_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)
 STCTEST_OBJECTS =  \
 	$(__stctest___win32rc) \
 	$(__stctest_os2_lib_res) \
--- a/contrib/samples/svg/Makefile.in
+++ b/contrib/samples/svg/Makefile.in
@@ -36,9 +36,10 @@ top_srcdir = @top_srcdir@

 DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-SVGTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+SVGTEST_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)
 SVGTEST_OBJECTS =  \
 	$(__svgtest___win32rc) \
 	$(__svgtest_os2_lib_res) \
--- a/contrib/samples/xrc/Makefile.in
+++ b/contrib/samples/xrc/Makefile.in
@@ -39,9 +39,10 @@ top_srcdir = @top_srcdir@
 DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
 WX_VERSION = 2.5.1
-XRCDEMO_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+XRCDEMO_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)
 XRCDEMO_OBJECTS =  \
 	$(__xrcdemo_os2_lib_res) \
 	xrcdemo_xrcdemo.o \