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

Fixed a couple of errors in the Makefiles.

Browse source 
Special cased lapack and blas, and took out a recursive variable defn.
This commit is contained in:
Harry Moffat 2007-10-29 23:50:09 +00:00
parent fbc2d6e0dd
commit d8bb6b7fd2
2 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
test_problems/CpJump/Makefile.in
View file

@ -52,6 +52,24 @@ CANTERA_LIBDIR=@buildlib@
# required Cantera libraries
CANTERA_LIBS = @LOCAL_LIBS@ -lctcxx
# Cantera library Dependencies
CANTERA_LIB_DEPS = $(CANTERA_LIBDIR)/liboneD.a \
$(CANTERA_LIBDIR)/libzeroD.a \
$(CANTERA_LIBDIR)/libkinetics.a \
$(CANTERA_LIBDIR)/libtransport.a \
$(CANTERA_LIBDIR)/libthermo.a \
$(CANTERA_LIBDIR)/libctnumerics.a \
$(CANTERA_LIBDIR)/libcvode.a \
$(CANTERA_LIBDIR)/libctbase.a \
$(CANTERA_LIBDIR)/libctmath.a \
$(CANTERA_LIBDIR)/libtpx.a \
$(CANTERA_LIBDIR)/libconverters.a
ifeq (@build_lapack@, 1)
CANTERA_LAPACK_DEPS = $(CANTERA_LIBDIR)/libctblas.a \
$(CANTERA_LIBDIR)/libctlapack.a
endif
# the directory where Cantera include files may be found.
ifeq ($(src_dir_tree), 1)
CANTERA_INCDIR=../../Cantera/src
@ -78,7 +96,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM)
$(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libctbase.a
$(PROGRAM): $(OBJS) $(CANTERA_LIB_DEPS) $(CANTERA_LAPACK_DEPS)
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)

7
test_problems/multiGasTransport/Makefile.in
View file

@ -66,9 +66,8 @@ CANTERA_LIB_DEPS = $(CANTERA_LIBDIR)/liboneD.a \
$(CANTERA_LIBDIR)/libconverters.a
ifeq (@build_lapack@, 1)
CANTERA_LIB_DEPS = $CANTERA_LIB_DEPS \
$(CANTERA_LIBDIR)/libctblas.a \
$(CANTERA_LIBDIR)/libctlapack.a
CANTERA_LAPACK_DEPS = $(CANTERA_LIBDIR)/libctblas.a \
$(CANTERA_LIBDIR)/libctlapack.a
endif
# the directory where Cantera include files may be found.
@ -99,7 +98,7 @@ PROGRAM = $(PROG_NAME)$(EXE_EXT)
all: $(PROGRAM)
# Rule to make the program
$(PROGRAM): $(OBJS) $(CANTERA_LIB_DEPS)
$(PROGRAM): $(OBJS) $(CANTERA_LIB_DEPS) $(CANTERA_LAPACK_DEPS)
$(CXX) -o $(PROGRAM) $(OBJS) $(LCXX_FLAGS) $(LINK_OPTIONS) \
$(CANTERA_LIBS) @LIBS@ $(FORT_LIBS) \
$(LCXX_END_LIBS)