From fa56309462f11e2f848707478ed660840586cab9 Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Fri, 12 Nov 2010 19:18:49 +0000 Subject: [PATCH] Modifications to the Makefiles to make the THREAD_SAFE_CANTERA ifdef block work again. --- test_problems/ChemEquil_gri_matrix/Makefile.in | 2 +- test_problems/ChemEquil_gri_pairs/Makefile.in | 2 +- test_problems/ChemEquil_ionizedGas/Makefile.in | 2 +- test_problems/ChemEquil_red1/Makefile.in | 2 +- test_problems/CpJump/Makefile.in | 2 +- test_problems/VCSnonideal/NaCl_equil/Makefile.in | 2 +- test_problems/cathermo/DH_graph_1/Makefile.in | 2 +- test_problems/cathermo/DH_graph_NM/Makefile.in | 2 +- test_problems/cathermo/DH_graph_acommon/Makefile.in | 2 +- test_problems/cathermo/HMW_dupl_test/Makefile.in | 2 +- test_problems/cathermo/HMW_graph_CpvT/Makefile.in | 2 +- test_problems/cathermo/HMW_graph_GvI/Makefile.in | 2 +- test_problems/cathermo/HMW_graph_GvT/Makefile.in | 2 +- test_problems/cathermo/HMW_graph_HvT/Makefile.in | 2 +- test_problems/cathermo/HMW_graph_VvT/Makefile.in | 2 +- test_problems/cathermo/VPissp/Makefile.in | 2 +- test_problems/cathermo/issp/Makefile.in | 2 +- test_problems/cathermo/stoichSubSSTP/Makefile.in | 2 +- test_problems/cathermo/testWaterTP/Makefile.in | 2 +- test_problems/cathermo/wtWater/Makefile.in | 2 +- test_problems/fracCoeff/Makefile.in | 2 +- test_problems/negATest/Makefile.in | 2 +- test_problems/rankine_democxx/Makefile.in | 2 +- test_problems/surfSolverTest/Makefile.in | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/test_problems/ChemEquil_gri_matrix/Makefile.in b/test_problems/ChemEquil_gri_matrix/Makefile.in index decf4e6c2..2054185f3 100644 --- a/test_problems/ChemEquil_gri_matrix/Makefile.in +++ b/test_problems/ChemEquil_gri_matrix/Makefile.in @@ -52,7 +52,7 @@ CANTERA_INCLUDES=-I$(CANTERA_INCROOTDIR) -I$(CANTERA_INCROOTDIR)/cantera # LOCAL_DEFS = -DEBUG_BASISOPTIMIZE # # C++ compile flags -CXX_FLAGS = @CXXFLAGS@ $(CANTERA_INCLUDES) $(LOCAL_DEFS) +CXX_FLAGS = @CXXFLAGS@ $(CANTERA_INCLUDES) $(LOCAL_DEFS) @CXX_INCLUDES@ # Ending C++ linking libraries LCXX_END_LIBS = @LCXX_END_LIBS@ diff --git a/test_problems/ChemEquil_gri_pairs/Makefile.in b/test_problems/ChemEquil_gri_pairs/Makefile.in index 960309deb..6e4d84b7f 100644 --- a/test_problems/ChemEquil_gri_pairs/Makefile.in +++ b/test_problems/ChemEquil_gri_pairs/Makefile.in @@ -37,7 +37,7 @@ endif CXX = @CXX@ # C++ compile flags -CXX_FLAGS = @CXXFLAGS@ +CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@ # Ending C++ linking libraries LCXX_END_LIBS = @LCXX_END_LIBS@ diff --git a/test_problems/ChemEquil_ionizedGas/Makefile.in b/test_problems/ChemEquil_ionizedGas/Makefile.in index a36be6324..d77d9ee7a 100644 --- a/test_problems/ChemEquil_ionizedGas/Makefile.in +++ b/test_problems/ChemEquil_ionizedGas/Makefile.in @@ -43,7 +43,7 @@ CXX = @CXX@ # LOCAL_DEFS=-DDEBUG_CHEMEQUIL # # C++ compile flags -CXX_FLAGS = @CXXFLAGS@ $(LOCAL_DEFS) +CXX_FLAGS = @CXXFLAGS@ $(LOCAL_DEFS) @CXX_INCLUDES@ # Ending C++ linking libraries LCXX_END_LIBS = @LCXX_END_LIBS@ diff --git a/test_problems/ChemEquil_red1/Makefile.in b/test_problems/ChemEquil_red1/Makefile.in index 551ee19f1..6da68eafd 100644 --- a/test_problems/ChemEquil_red1/Makefile.in +++ b/test_problems/ChemEquil_red1/Makefile.in @@ -52,7 +52,7 @@ CANTERA_INCLUDES=-I$(CANTERA_INCROOTDIR) -I$(CANTERA_INCROOTDIR)/cantera # LOCAL_DEFS = -DEBUG_BASISOPTIMIZE # # C++ compile flags -CXX_FLAGS = @CXXFLAGS@ $(CANTERA_INCLUDES) $(LOCAL_DEFS) +CXX_FLAGS = @CXXFLAGS@ $(CANTERA_INCLUDES) $(LOCAL_DEFS) @CXX_INCLUDES@ # Ending C++ linking libraries LCXX_END_LIBS = @LCXX_END_LIBS@ diff --git a/test_problems/CpJump/Makefile.in b/test_problems/CpJump/Makefile.in index 2eaf597fc..80d82350d 100644 --- a/test_problems/CpJump/Makefile.in +++ b/test_problems/CpJump/Makefile.in @@ -37,7 +37,7 @@ endif CXX = @CXX@ # C++ compile flags -CXX_FLAGS = @CXXFLAGS@ +CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@ # Ending C++ linking libraries LCXX_END_LIBS = @LCXX_END_LIBS@ diff --git a/test_problems/VCSnonideal/NaCl_equil/Makefile.in b/test_problems/VCSnonideal/NaCl_equil/Makefile.in index 4f5a8fd0c..9b24dbd03 100644 --- a/test_problems/VCSnonideal/NaCl_equil/Makefile.in +++ b/test_problems/VCSnonideal/NaCl_equil/Makefile.in @@ -45,7 +45,7 @@ CANTERA_INCDIR=@ctroot@/build/include/cantera INCLUDE_DIRS = -I$(CANTERA_INCDIR) # C++ compile flags -CXX_FLAGS = @CXXFLAGS@ $(INCLUDE_DIRS) +CXX_FLAGS = @CXXFLAGS@ $(INCLUDE_DIRS) @CXX_INCLUDES@ # Ending C++ linking libraries LCXX_END_LIBS = @LCXX_END_LIBS@ diff --git a/test_problems/cathermo/DH_graph_1/Makefile.in b/test_problems/cathermo/DH_graph_1/Makefile.in index 0cfc4d76a..757519488 100644 --- a/test_problems/cathermo/DH_graph_1/Makefile.in +++ b/test_problems/cathermo/DH_graph_1/Makefile.in @@ -37,7 +37,7 @@ endif CXX = @CXX@ # C++ compile flags -CXX_FLAGS = @CXXFLAGS@ +CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@ # Ending C++ linking libraries LCXX_END_LIBS = @LCXX_END_LIBS@ diff --git a/test_problems/cathermo/DH_graph_NM/Makefile.in b/test_problems/cathermo/DH_graph_NM/Makefile.in index 0029fed70..c58bbb03a 100644 --- a/test_problems/cathermo/DH_graph_NM/Makefile.in +++ b/test_problems/cathermo/DH_graph_NM/Makefile.in @@ -37,7 +37,7 @@ endif CXX = @CXX@ # C++ compile flags -CXX_FLAGS = @CXXFLAGS@ +CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@ # Ending C++ linking libraries LCXX_END_LIBS = @LCXX_END_LIBS@ diff --git a/test_problems/cathermo/DH_graph_acommon/Makefile.in b/test_problems/cathermo/DH_graph_acommon/Makefile.in index 2f5f6264e..de638c902 100644 --- a/test_problems/cathermo/DH_graph_acommon/Makefile.in +++ b/test_problems/cathermo/DH_graph_acommon/Makefile.in @@ -38,7 +38,7 @@ endif CXX = @CXX@ # C++ compile flags -CXX_FLAGS = @CXXFLAGS@ +CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@ # Ending C++ linking libraries LCXX_END_LIBS = @LCXX_END_LIBS@ diff --git a/test_problems/cathermo/HMW_dupl_test/Makefile.in b/test_problems/cathermo/HMW_dupl_test/Makefile.in index e210ad1b9..95f410f8c 100644 --- a/test_problems/cathermo/HMW_dupl_test/Makefile.in +++ b/test_problems/cathermo/HMW_dupl_test/Makefile.in @@ -39,7 +39,7 @@ endif CXX = @CXX@ # C++ compile flags -CXX_FLAGS = @CXXFLAGS@ +CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@ # Ending C++ linking libraries LCXX_END_LIBS = @LCXX_END_LIBS@ diff --git a/test_problems/cathermo/HMW_graph_CpvT/Makefile.in b/test_problems/cathermo/HMW_graph_CpvT/Makefile.in index 39ae2000a..445a524ff 100644 --- a/test_problems/cathermo/HMW_graph_CpvT/Makefile.in +++ b/test_problems/cathermo/HMW_graph_CpvT/Makefile.in @@ -39,7 +39,7 @@ endif CXX = @CXX@ # C++ compile flags -CXX_FLAGS = @CXXFLAGS@ +CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@ # Ending C++ linking libraries LCXX_END_LIBS = @LCXX_END_LIBS@ diff --git a/test_problems/cathermo/HMW_graph_GvI/Makefile.in b/test_problems/cathermo/HMW_graph_GvI/Makefile.in index 505d6ad40..cc2d1cbe2 100644 --- a/test_problems/cathermo/HMW_graph_GvI/Makefile.in +++ b/test_problems/cathermo/HMW_graph_GvI/Makefile.in @@ -39,7 +39,7 @@ endif CXX = @CXX@ # C++ compile flags -CXX_FLAGS = -DSRCDIRTREE @CXXFLAGS@ +CXX_FLAGS = -DSRCDIRTREE @CXXFLAGS@ @CXX_INCLUDES@ # Ending C++ linking libraries LCXX_END_LIBS = @LCXX_END_LIBS@ diff --git a/test_problems/cathermo/HMW_graph_GvT/Makefile.in b/test_problems/cathermo/HMW_graph_GvT/Makefile.in index 0127086c1..c65d4916f 100644 --- a/test_problems/cathermo/HMW_graph_GvT/Makefile.in +++ b/test_problems/cathermo/HMW_graph_GvT/Makefile.in @@ -37,7 +37,7 @@ endif CXX = @CXX@ # C++ compile flags -CXX_FLAGS = @CXXFLAGS@ +CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@ # Ending C++ linking libraries LCXX_END_LIBS = @LCXX_END_LIBS@ diff --git a/test_problems/cathermo/HMW_graph_HvT/Makefile.in b/test_problems/cathermo/HMW_graph_HvT/Makefile.in index f23503d3a..b0ecf6a2b 100644 --- a/test_problems/cathermo/HMW_graph_HvT/Makefile.in +++ b/test_problems/cathermo/HMW_graph_HvT/Makefile.in @@ -39,7 +39,7 @@ endif CXX = @CXX@ # C++ compile flags -CXX_FLAGS = @CXXFLAGS@ +CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@ # Ending C++ linking libraries LCXX_END_LIBS = @LCXX_END_LIBS@ diff --git a/test_problems/cathermo/HMW_graph_VvT/Makefile.in b/test_problems/cathermo/HMW_graph_VvT/Makefile.in index 8325e574c..cd5437328 100644 --- a/test_problems/cathermo/HMW_graph_VvT/Makefile.in +++ b/test_problems/cathermo/HMW_graph_VvT/Makefile.in @@ -39,7 +39,7 @@ endif CXX = @CXX@ # C++ compile flags -CXX_FLAGS = @CXXFLAGS@ +CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@ # Ending C++ linking libraries LCXX_END_LIBS = @LCXX_END_LIBS@ diff --git a/test_problems/cathermo/VPissp/Makefile.in b/test_problems/cathermo/VPissp/Makefile.in index ae869c571..59082ea8c 100644 --- a/test_problems/cathermo/VPissp/Makefile.in +++ b/test_problems/cathermo/VPissp/Makefile.in @@ -39,7 +39,7 @@ endif CXX = @CXX@ # C++ compile flags -CXX_FLAGS = @CXXFLAGS@ +CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@ # Ending C++ linking libraries LCXX_END_LIBS = @LCXX_END_LIBS@ diff --git a/test_problems/cathermo/issp/Makefile.in b/test_problems/cathermo/issp/Makefile.in index f4cd8710e..366a13061 100644 --- a/test_problems/cathermo/issp/Makefile.in +++ b/test_problems/cathermo/issp/Makefile.in @@ -39,7 +39,7 @@ endif CXX = @CXX@ # C++ compile flags -CXX_FLAGS = @CXXFLAGS@ +CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@ # Ending C++ linking libraries LCXX_END_LIBS = @LCXX_END_LIBS@ diff --git a/test_problems/cathermo/stoichSubSSTP/Makefile.in b/test_problems/cathermo/stoichSubSSTP/Makefile.in index 7b733c665..71498b17f 100644 --- a/test_problems/cathermo/stoichSubSSTP/Makefile.in +++ b/test_problems/cathermo/stoichSubSSTP/Makefile.in @@ -37,7 +37,7 @@ endif CXX = @CXX@ # C++ compile flags -CXX_FLAGS = @CXXFLAGS@ +CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@ # Ending C++ linking libraries LCXX_END_LIBS = @LCXX_END_LIBS@ diff --git a/test_problems/cathermo/testWaterTP/Makefile.in b/test_problems/cathermo/testWaterTP/Makefile.in index 685de3f4b..1dd7c0eb6 100644 --- a/test_problems/cathermo/testWaterTP/Makefile.in +++ b/test_problems/cathermo/testWaterTP/Makefile.in @@ -37,7 +37,7 @@ endif CXX = @CXX@ # C++ compile flags -CXX_FLAGS = @CXXFLAGS@ +CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@ # Ending C++ linking libraries LCXX_END_LIBS = @LCXX_END_LIBS@ diff --git a/test_problems/cathermo/wtWater/Makefile.in b/test_problems/cathermo/wtWater/Makefile.in index a8156e502..3aaaec32d 100755 --- a/test_problems/cathermo/wtWater/Makefile.in +++ b/test_problems/cathermo/wtWater/Makefile.in @@ -37,7 +37,7 @@ endif CXX = @CXX@ # C++ compile flags -CXX_FLAGS = @CXXFLAGS@ +CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@ # Ending C++ linking libraries LCXX_END_LIBS = @LCXX_END_LIBS@ diff --git a/test_problems/fracCoeff/Makefile.in b/test_problems/fracCoeff/Makefile.in index 275ee94ad..a4b2bd09c 100644 --- a/test_problems/fracCoeff/Makefile.in +++ b/test_problems/fracCoeff/Makefile.in @@ -39,7 +39,7 @@ endif CXX = @CXX@ # C++ compile flags -CXX_FLAGS = @CXXFLAGS@ +CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@ # Ending C++ linking libraries LCXX_END_LIBS = @LCXX_END_LIBS@ diff --git a/test_problems/negATest/Makefile.in b/test_problems/negATest/Makefile.in index ef159696a..bd11bd1b4 100644 --- a/test_problems/negATest/Makefile.in +++ b/test_problems/negATest/Makefile.in @@ -37,7 +37,7 @@ endif CXX = @CXX@ # C++ compile flags -CXX_FLAGS = @CXXFLAGS@ +CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@ # Ending C++ linking libraries LCXX_END_LIBS = @LCXX_END_LIBS@ diff --git a/test_problems/rankine_democxx/Makefile.in b/test_problems/rankine_democxx/Makefile.in index 781edc60e..19a4a97af 100644 --- a/test_problems/rankine_democxx/Makefile.in +++ b/test_problems/rankine_democxx/Makefile.in @@ -51,7 +51,7 @@ CANTERA_INCLUDES=-I$(CANTERA_INCROOTDIR) -I$(CANTERA_INCROOTDIR)/cantera # LOCAL_DEFS = -DEBUG_BASISOPTIMIZE # # C++ compile flags -CXX_FLAGS = @CXXFLAGS@ $(CANTERA_INCLUDES) $(LOCAL_DEFS) +CXX_FLAGS = @CXXFLAGS@ $(CANTERA_INCLUDES) $(LOCAL_DEFS) @CXX_INCLUDES@ # Ending C++ linking libraries LCXX_END_LIBS = @LCXX_END_LIBS@ diff --git a/test_problems/surfSolverTest/Makefile.in b/test_problems/surfSolverTest/Makefile.in index 887eddc3e..c3e454b9b 100644 --- a/test_problems/surfSolverTest/Makefile.in +++ b/test_problems/surfSolverTest/Makefile.in @@ -37,7 +37,7 @@ endif CXX = @CXX@ # C++ compile flags -CXX_FLAGS = @CXXFLAGS@ +CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@ # Ending C++ linking libraries LCXX_END_LIBS = @LCXX_END_LIBS@