Modifications to the Makefiles to make the THREAD_SAFE_CANTERA ifdef
block work again.
This commit is contained in:
parent
56ad9ca9e8
commit
fa56309462
24 changed files with 24 additions and 24 deletions
|
|
@ -52,7 +52,7 @@ CANTERA_INCLUDES=-I$(CANTERA_INCROOTDIR) -I$(CANTERA_INCROOTDIR)/cantera
|
||||||
# LOCAL_DEFS = -DEBUG_BASISOPTIMIZE
|
# LOCAL_DEFS = -DEBUG_BASISOPTIMIZE
|
||||||
#
|
#
|
||||||
# C++ compile flags
|
# C++ compile flags
|
||||||
CXX_FLAGS = @CXXFLAGS@ $(CANTERA_INCLUDES) $(LOCAL_DEFS)
|
CXX_FLAGS = @CXXFLAGS@ $(CANTERA_INCLUDES) $(LOCAL_DEFS) @CXX_INCLUDES@
|
||||||
|
|
||||||
# Ending C++ linking libraries
|
# Ending C++ linking libraries
|
||||||
LCXX_END_LIBS = @LCXX_END_LIBS@
|
LCXX_END_LIBS = @LCXX_END_LIBS@
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ endif
|
||||||
CXX = @CXX@
|
CXX = @CXX@
|
||||||
|
|
||||||
# C++ compile flags
|
# C++ compile flags
|
||||||
CXX_FLAGS = @CXXFLAGS@
|
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
|
||||||
|
|
||||||
# Ending C++ linking libraries
|
# Ending C++ linking libraries
|
||||||
LCXX_END_LIBS = @LCXX_END_LIBS@
|
LCXX_END_LIBS = @LCXX_END_LIBS@
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@ CXX = @CXX@
|
||||||
# LOCAL_DEFS=-DDEBUG_CHEMEQUIL
|
# LOCAL_DEFS=-DDEBUG_CHEMEQUIL
|
||||||
#
|
#
|
||||||
# C++ compile flags
|
# C++ compile flags
|
||||||
CXX_FLAGS = @CXXFLAGS@ $(LOCAL_DEFS)
|
CXX_FLAGS = @CXXFLAGS@ $(LOCAL_DEFS) @CXX_INCLUDES@
|
||||||
|
|
||||||
# Ending C++ linking libraries
|
# Ending C++ linking libraries
|
||||||
LCXX_END_LIBS = @LCXX_END_LIBS@
|
LCXX_END_LIBS = @LCXX_END_LIBS@
|
||||||
|
|
|
||||||
|
|
@ -52,7 +52,7 @@ CANTERA_INCLUDES=-I$(CANTERA_INCROOTDIR) -I$(CANTERA_INCROOTDIR)/cantera
|
||||||
# LOCAL_DEFS = -DEBUG_BASISOPTIMIZE
|
# LOCAL_DEFS = -DEBUG_BASISOPTIMIZE
|
||||||
#
|
#
|
||||||
# C++ compile flags
|
# C++ compile flags
|
||||||
CXX_FLAGS = @CXXFLAGS@ $(CANTERA_INCLUDES) $(LOCAL_DEFS)
|
CXX_FLAGS = @CXXFLAGS@ $(CANTERA_INCLUDES) $(LOCAL_DEFS) @CXX_INCLUDES@
|
||||||
|
|
||||||
# Ending C++ linking libraries
|
# Ending C++ linking libraries
|
||||||
LCXX_END_LIBS = @LCXX_END_LIBS@
|
LCXX_END_LIBS = @LCXX_END_LIBS@
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ endif
|
||||||
CXX = @CXX@
|
CXX = @CXX@
|
||||||
|
|
||||||
# C++ compile flags
|
# C++ compile flags
|
||||||
CXX_FLAGS = @CXXFLAGS@
|
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
|
||||||
|
|
||||||
# Ending C++ linking libraries
|
# Ending C++ linking libraries
|
||||||
LCXX_END_LIBS = @LCXX_END_LIBS@
|
LCXX_END_LIBS = @LCXX_END_LIBS@
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@ CANTERA_INCDIR=@ctroot@/build/include/cantera
|
||||||
INCLUDE_DIRS = -I$(CANTERA_INCDIR)
|
INCLUDE_DIRS = -I$(CANTERA_INCDIR)
|
||||||
|
|
||||||
# C++ compile flags
|
# C++ compile flags
|
||||||
CXX_FLAGS = @CXXFLAGS@ $(INCLUDE_DIRS)
|
CXX_FLAGS = @CXXFLAGS@ $(INCLUDE_DIRS) @CXX_INCLUDES@
|
||||||
|
|
||||||
# Ending C++ linking libraries
|
# Ending C++ linking libraries
|
||||||
LCXX_END_LIBS = @LCXX_END_LIBS@
|
LCXX_END_LIBS = @LCXX_END_LIBS@
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ endif
|
||||||
CXX = @CXX@
|
CXX = @CXX@
|
||||||
|
|
||||||
# C++ compile flags
|
# C++ compile flags
|
||||||
CXX_FLAGS = @CXXFLAGS@
|
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
|
||||||
|
|
||||||
# Ending C++ linking libraries
|
# Ending C++ linking libraries
|
||||||
LCXX_END_LIBS = @LCXX_END_LIBS@
|
LCXX_END_LIBS = @LCXX_END_LIBS@
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ endif
|
||||||
CXX = @CXX@
|
CXX = @CXX@
|
||||||
|
|
||||||
# C++ compile flags
|
# C++ compile flags
|
||||||
CXX_FLAGS = @CXXFLAGS@
|
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
|
||||||
|
|
||||||
# Ending C++ linking libraries
|
# Ending C++ linking libraries
|
||||||
LCXX_END_LIBS = @LCXX_END_LIBS@
|
LCXX_END_LIBS = @LCXX_END_LIBS@
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,7 @@ endif
|
||||||
CXX = @CXX@
|
CXX = @CXX@
|
||||||
|
|
||||||
# C++ compile flags
|
# C++ compile flags
|
||||||
CXX_FLAGS = @CXXFLAGS@
|
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
|
||||||
|
|
||||||
# Ending C++ linking libraries
|
# Ending C++ linking libraries
|
||||||
LCXX_END_LIBS = @LCXX_END_LIBS@
|
LCXX_END_LIBS = @LCXX_END_LIBS@
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,7 @@ endif
|
||||||
CXX = @CXX@
|
CXX = @CXX@
|
||||||
|
|
||||||
# C++ compile flags
|
# C++ compile flags
|
||||||
CXX_FLAGS = @CXXFLAGS@
|
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
|
||||||
|
|
||||||
# Ending C++ linking libraries
|
# Ending C++ linking libraries
|
||||||
LCXX_END_LIBS = @LCXX_END_LIBS@
|
LCXX_END_LIBS = @LCXX_END_LIBS@
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,7 @@ endif
|
||||||
CXX = @CXX@
|
CXX = @CXX@
|
||||||
|
|
||||||
# C++ compile flags
|
# C++ compile flags
|
||||||
CXX_FLAGS = @CXXFLAGS@
|
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
|
||||||
|
|
||||||
# Ending C++ linking libraries
|
# Ending C++ linking libraries
|
||||||
LCXX_END_LIBS = @LCXX_END_LIBS@
|
LCXX_END_LIBS = @LCXX_END_LIBS@
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,7 @@ endif
|
||||||
CXX = @CXX@
|
CXX = @CXX@
|
||||||
|
|
||||||
# C++ compile flags
|
# C++ compile flags
|
||||||
CXX_FLAGS = -DSRCDIRTREE @CXXFLAGS@
|
CXX_FLAGS = -DSRCDIRTREE @CXXFLAGS@ @CXX_INCLUDES@
|
||||||
|
|
||||||
# Ending C++ linking libraries
|
# Ending C++ linking libraries
|
||||||
LCXX_END_LIBS = @LCXX_END_LIBS@
|
LCXX_END_LIBS = @LCXX_END_LIBS@
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ endif
|
||||||
CXX = @CXX@
|
CXX = @CXX@
|
||||||
|
|
||||||
# C++ compile flags
|
# C++ compile flags
|
||||||
CXX_FLAGS = @CXXFLAGS@
|
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
|
||||||
|
|
||||||
# Ending C++ linking libraries
|
# Ending C++ linking libraries
|
||||||
LCXX_END_LIBS = @LCXX_END_LIBS@
|
LCXX_END_LIBS = @LCXX_END_LIBS@
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,7 @@ endif
|
||||||
CXX = @CXX@
|
CXX = @CXX@
|
||||||
|
|
||||||
# C++ compile flags
|
# C++ compile flags
|
||||||
CXX_FLAGS = @CXXFLAGS@
|
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
|
||||||
|
|
||||||
# Ending C++ linking libraries
|
# Ending C++ linking libraries
|
||||||
LCXX_END_LIBS = @LCXX_END_LIBS@
|
LCXX_END_LIBS = @LCXX_END_LIBS@
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,7 @@ endif
|
||||||
CXX = @CXX@
|
CXX = @CXX@
|
||||||
|
|
||||||
# C++ compile flags
|
# C++ compile flags
|
||||||
CXX_FLAGS = @CXXFLAGS@
|
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
|
||||||
|
|
||||||
# Ending C++ linking libraries
|
# Ending C++ linking libraries
|
||||||
LCXX_END_LIBS = @LCXX_END_LIBS@
|
LCXX_END_LIBS = @LCXX_END_LIBS@
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,7 @@ endif
|
||||||
CXX = @CXX@
|
CXX = @CXX@
|
||||||
|
|
||||||
# C++ compile flags
|
# C++ compile flags
|
||||||
CXX_FLAGS = @CXXFLAGS@
|
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
|
||||||
|
|
||||||
# Ending C++ linking libraries
|
# Ending C++ linking libraries
|
||||||
LCXX_END_LIBS = @LCXX_END_LIBS@
|
LCXX_END_LIBS = @LCXX_END_LIBS@
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,7 @@ endif
|
||||||
CXX = @CXX@
|
CXX = @CXX@
|
||||||
|
|
||||||
# C++ compile flags
|
# C++ compile flags
|
||||||
CXX_FLAGS = @CXXFLAGS@
|
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
|
||||||
|
|
||||||
# Ending C++ linking libraries
|
# Ending C++ linking libraries
|
||||||
LCXX_END_LIBS = @LCXX_END_LIBS@
|
LCXX_END_LIBS = @LCXX_END_LIBS@
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ endif
|
||||||
CXX = @CXX@
|
CXX = @CXX@
|
||||||
|
|
||||||
# C++ compile flags
|
# C++ compile flags
|
||||||
CXX_FLAGS = @CXXFLAGS@
|
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
|
||||||
|
|
||||||
# Ending C++ linking libraries
|
# Ending C++ linking libraries
|
||||||
LCXX_END_LIBS = @LCXX_END_LIBS@
|
LCXX_END_LIBS = @LCXX_END_LIBS@
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ endif
|
||||||
CXX = @CXX@
|
CXX = @CXX@
|
||||||
|
|
||||||
# C++ compile flags
|
# C++ compile flags
|
||||||
CXX_FLAGS = @CXXFLAGS@
|
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
|
||||||
|
|
||||||
# Ending C++ linking libraries
|
# Ending C++ linking libraries
|
||||||
LCXX_END_LIBS = @LCXX_END_LIBS@
|
LCXX_END_LIBS = @LCXX_END_LIBS@
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ endif
|
||||||
CXX = @CXX@
|
CXX = @CXX@
|
||||||
|
|
||||||
# C++ compile flags
|
# C++ compile flags
|
||||||
CXX_FLAGS = @CXXFLAGS@
|
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
|
||||||
|
|
||||||
# Ending C++ linking libraries
|
# Ending C++ linking libraries
|
||||||
LCXX_END_LIBS = @LCXX_END_LIBS@
|
LCXX_END_LIBS = @LCXX_END_LIBS@
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,7 @@ endif
|
||||||
CXX = @CXX@
|
CXX = @CXX@
|
||||||
|
|
||||||
# C++ compile flags
|
# C++ compile flags
|
||||||
CXX_FLAGS = @CXXFLAGS@
|
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
|
||||||
|
|
||||||
# Ending C++ linking libraries
|
# Ending C++ linking libraries
|
||||||
LCXX_END_LIBS = @LCXX_END_LIBS@
|
LCXX_END_LIBS = @LCXX_END_LIBS@
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ endif
|
||||||
CXX = @CXX@
|
CXX = @CXX@
|
||||||
|
|
||||||
# C++ compile flags
|
# C++ compile flags
|
||||||
CXX_FLAGS = @CXXFLAGS@
|
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
|
||||||
|
|
||||||
# Ending C++ linking libraries
|
# Ending C++ linking libraries
|
||||||
LCXX_END_LIBS = @LCXX_END_LIBS@
|
LCXX_END_LIBS = @LCXX_END_LIBS@
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@ CANTERA_INCLUDES=-I$(CANTERA_INCROOTDIR) -I$(CANTERA_INCROOTDIR)/cantera
|
||||||
# LOCAL_DEFS = -DEBUG_BASISOPTIMIZE
|
# LOCAL_DEFS = -DEBUG_BASISOPTIMIZE
|
||||||
#
|
#
|
||||||
# C++ compile flags
|
# C++ compile flags
|
||||||
CXX_FLAGS = @CXXFLAGS@ $(CANTERA_INCLUDES) $(LOCAL_DEFS)
|
CXX_FLAGS = @CXXFLAGS@ $(CANTERA_INCLUDES) $(LOCAL_DEFS) @CXX_INCLUDES@
|
||||||
|
|
||||||
# Ending C++ linking libraries
|
# Ending C++ linking libraries
|
||||||
LCXX_END_LIBS = @LCXX_END_LIBS@
|
LCXX_END_LIBS = @LCXX_END_LIBS@
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ endif
|
||||||
CXX = @CXX@
|
CXX = @CXX@
|
||||||
|
|
||||||
# C++ compile flags
|
# C++ compile flags
|
||||||
CXX_FLAGS = @CXXFLAGS@
|
CXX_FLAGS = @CXXFLAGS@ @CXX_INCLUDES@
|
||||||
|
|
||||||
# Ending C++ linking libraries
|
# Ending C++ linking libraries
|
||||||
LCXX_END_LIBS = @LCXX_END_LIBS@
|
LCXX_END_LIBS = @LCXX_END_LIBS@
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue