research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changes in Makefiles to support the SAFE THREADS capability.

Browse source
This commit is contained in:
Harry Moffat 2008-01-16 21:38:52 +00:00
parent 405e79bc83
commit bcdd65922a
5 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
test_problems/ChemEquil_gri_matrix/Makefile.in
View file

@ -65,7 +65,10 @@ CANTERA_LIBDIR=@ct_libdir@
endif endif
# required Cantera libraries # required Cantera libraries
CANTERA_LIBS = -L$(CANTERA_LIBDIR) @LOCAL_LIBS@ -lctcxx # -> don't need this: -L$(CANTERA_LIBDIR) as
# @LOCAL_LIB_DIRS@ has this directory
#
CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
ifeq ($(in_CanteraBuildTree),1) ifeq ($(in_CanteraBuildTree),1)
CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
@ -78,9 +81,10 @@ endif
ALT_LIBS_DEP := $(addprefix $(CANTER_LIBDIR), @RAW_LIBS_DEP@ libctcxx.a) ALT_LIBS_DEP := $(addprefix $(CANTER_LIBDIR), @RAW_LIBS_DEP@ libctcxx.a)
# flags passed to the C++ compiler/linker for the linking step # flags passed to the C++ compiler/linker for the linking step
LCXX_FLAGS = @CXXFLAGS@ LCXX_FLAGS = @CXXFLAGS@ @LOCAL_LIB_DIRS@
# How to compile C++ source files to object files # How to compile C++ source files to object files
# -> don't need this: @CXX_INCLUDES@
.cpp.o: .cpp.o:
$(CXX) -c $< $(CXX_FLAGS) $(CXX) -c $< $(CXX_FLAGS)

4
test_problems/ChemEquil_red1/Makefile.in
View file

@ -65,7 +65,7 @@ CANTERA_LIBDIR=@ct_libdir@
endif endif
# required Cantera libraries # required Cantera libraries
CANTERA_LIBS = -L$(CANTERA_LIBDIR) @LOCAL_LIBS@ -lctcxx CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
ifeq ($(in_CanteraBuildTree),1) ifeq ($(in_CanteraBuildTree),1)
CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
@ -77,7 +77,7 @@ endif
ALT_LIBS_DEP := $(addprefix $(CANTER_LIBDIR), @RAW_LIBS_DEP@ libctcxx.a) ALT_LIBS_DEP := $(addprefix $(CANTER_LIBDIR), @RAW_LIBS_DEP@ libctcxx.a)
# flags passed to the C++ compiler/linker for the linking step # flags passed to the C++ compiler/linker for the linking step
LCXX_FLAGS = @CXXFLAGS@ LCXX_FLAGS = @CXXFLAGS@ @LOCAL_LIB_DIRS@
# How to compile C++ source files to object files # How to compile C++ source files to object files
.cpp.o: .cpp.o:

5
test_problems/VCSnonideal/NaCl_equil/Makefile.in
View file

@ -60,8 +60,7 @@ CANTERA_LIBDIR=@buildlib@
# #
# Setup The Cantera Interface # Setup The Cantera Interface
# #
CANTERA_LIBS=-lequil -lVCSnonideal -lthermo -ltpx -lctnumerics \ CANTERA_LIBS= @LOCAL_LIBS@ -lctcxx
-lctbase -lctlapack -lctblas -lctcxx
CANTERA_LIBDEP = \ CANTERA_LIBDEP = \
$(CANTERA_LIBDIR)/libequil.a \ $(CANTERA_LIBDIR)/libequil.a \
@ -76,7 +75,7 @@ CANTERA_LIBDEP = \
# flags passed to the C++ compiler/linker for the linking step # flags passed to the C++ compiler/linker for the linking step
LCXX_FLAGS = -L$(CANTERA_LIBDIR) @CXXFLAGS@ LCXX_FLAGS = @CXXFLAGS@ @LOCAL_LIB_DIRS@
# How to compile C++ source files to object files # How to compile C++ source files to object files
.cpp.o: .cpp.o:

2
test_problems/pureFluidTest/Makefile.in
View file

@ -53,7 +53,7 @@ CANTERA_INCDIR=@ctroot@/build/include/cantera
INCLUDES=-I$(CANTERA_INCDIR) -I$(CANTERA_INCDIR)/kernel @CXX_INCLUDES@ INCLUDES=-I$(CANTERA_INCDIR) -I$(CANTERA_INCDIR)/kernel @CXX_INCLUDES@
# flags passed to the C++ compiler/linker for the linking step # flags passed to the C++ compiler/linker for the linking step
LCXX_FLAGS = -L$(CANTERA_LIBDIR) @LOCAL_LIB_DIRS@ @CXXFLAGS@ LCXX_FLAGS = @CXXFLAGS@ @LOCAL_LIB_DIRS@
# How to compile C++ source files to object files # How to compile C++ source files to object files
.@CXX_EXT@.@OBJ_EXT@: .@CXX_EXT@.@OBJ_EXT@:

4
test_problems/rankine_democxx/Makefile.in
View file

@ -64,7 +64,7 @@ CANTERA_LIBDIR=@ct_libdir@
endif endif
# required Cantera libraries # required Cantera libraries
CANTERA_LIBS = -L$(CANTERA_LIBDIR) @LOCAL_LIBS@ -lctcxx CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
ifeq ($(in_CanteraBuildTree),1) ifeq ($(in_CanteraBuildTree),1)
CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a CANTERA_LIBS_DEP = @LOCAL_LIBS_DEP@ $(CANTERA_LIBDIR)/libctcxx.a
@ -76,7 +76,7 @@ endif
ALT_LIBS_DEP := $(addprefix $(CANTER_LIBDIR), @RAW_LIBS_DEP@ libctcxx.a) ALT_LIBS_DEP := $(addprefix $(CANTER_LIBDIR), @RAW_LIBS_DEP@ libctcxx.a)
# flags passed to the C++ compiler/linker for the linking step # flags passed to the C++ compiler/linker for the linking step
LCXX_FLAGS = @CXXFLAGS@ LCXX_FLAGS = @CXXFLAGS@ @LOCAL_LIB_DIRS@
# How to compile C++ source files to object files # How to compile C++ source files to object files
.cpp.o: .cpp.o: