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

[cantera2.0]: more makefile.am fixes--very close to compiling regression tests, now

Browse source
This commit is contained in:
Nicholas Malaya 2012-06-18 15:14:58 +00:00
parent cb7730479f
commit 4a80712846
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
configure.ac
View file

@ -94,6 +94,13 @@ DX_INIT_DOXYGEN(cantera, doxygen/cantera.dox, docs)
# Generate Output Files
AC_OUTPUT(Makefile \
ext/Makefile \
ext/libexecstream/Makefile \
ext/f2c_math/Makefile \
ext/f2c_libs/Makefile \
ext/f2c_blas/Makefile \
ext/f2c_lapack/Makefile \
ext/cvode/Makefile \
test_problems/Makefile \
test_problems/mixGasTransport/Makefile \
test_problems/ChemEquil_gri_matrix/Makefile \
@ -148,12 +155,6 @@ AC_OUTPUT(Makefile \
src/transport/Makefile \
src/spectra/Makefile src/zeroD/Makefile \
src/equil/Makefile \
ext/Makefile \
ext/f2c_libs/Makefile \
ext/f2c_blas/Makefile \
ext/f2c_lapack/Makefile \
ext/libexecstream/Makefile \
ext/cvode/Makefile \
cantera.pc)
# skipped tests
@ -161,7 +162,6 @@ AC_OUTPUT(Makefile \
# test_problems/nasa9_reader/Makefile
# test_problems/rankine_democxx/Makefile
# test_problems/VCSnonideal/NaCl_equil/Makefile
# ext/f2c_math/Makefile \
# FINAL SUMMARY
AX_SUMMARIZE_CONFIG

2
src/base/Makefile.am
View file

@ -7,7 +7,7 @@ cc_sources = ct2ctml.cpp ctml.cpp plots.cpp \
global.cpp
AM_LDFLAGS = -L$(top_builddir)/build/lib/
LIBS = -lexecstream
LIBS = -L$(top_builddir)/build/lib/ -lexecstream
AM_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/include -I$(top_builddir)/ext/libexecstream
AM_CXXFLAGS = $(AM_CPPFLAGS)

4
test_problems/cathermo/DH_graph_1/Makefile.am
View file

@ -3,8 +3,8 @@ INC += -I$(top_builddir)/ext/libexecstream
AM_CPPFLAGS = $(INC)
AM_CXXFLAGS = $(AM_CPPFLAGS)
LINK = -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode
LINK = -lctmath -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK += -lctnumerics -ltpx -lctspectra -lconverters -lctbase -lcvode
LINK += -lctlapack -lctblas -lctf2c -lm -lstdc++ -lexecstream
#-lctcxx -luser
AM_LDFLAGS = -L$(top_builddir)/build/lib/