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

[cantera2.0]: updating a few makefiles for the autotools version. Not yet working without link errors, but getting close

Browse source
This commit is contained in:
Nicholas Malaya 2012-06-18 02:29:29 +00:00
parent 927e128257
commit 92c5f5c57f
8 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configure.ac
View file

@ -152,7 +152,6 @@ AC_OUTPUT(Makefile \
ext/f2c_libs/Makefile \
ext/f2c_blas/Makefile \
ext/f2c_lapack/Makefile \
ext/f2c_math/Makefile \
ext/cvode/Makefile \
cantera.pc)
@ -161,7 +160,7 @@ 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

6
src/base/Makefile.am
View file

@ -1,6 +1,5 @@
h_sources = LogPrintCtrl.h
cc_sources = ct2ctml.cpp ctml.cpp plots.cpp \
stringUtils.cpp xml.cpp clockWC.cpp \
PrintCtrl.cpp LogPrintCtrl.cpp mdp_allo.cpp \
@ -25,9 +24,4 @@ __top_builddir__build_lib_libctbase_la_SOURCES = $(cc_sources) $(h_sources)
__top_builddir__build_lib_libctbase_include_HEADERS = $(h_sources)
__top_builddir__build_lib_libctbase_includedir = $(prefix)/include
# header file accumulation -- only copy if file updated!
#all:
# @echo copying headers $<
# cp -p *.h $(top_builddir)/build/include/
CLEANFILES = *.o

2
src/converters/Makefile.am
View file

@ -1,5 +1,5 @@
h_sources =
cc_sources = atomicWeightDB.cpp CKReader.cpp \
cc_sources = atomicWeightDB.cpp CKReader.cpp \
Reaction.cpp thermoFunctions.cpp ck2ct.cpp CKParser.cpp \
ckr_utils.cpp NASA9Parser.cpp Species.cpp writelog.cpp

6
src/equil/Makefile.am
View file

@ -10,16 +10,16 @@ cc_sources = BasisOptimize.cpp vcs_Gibbs.cpp vcs_root1d.cpp \
vcs_equilibrate.cpp vcs_rearrange.cpp vcs_util.cpp \
vcs_Exception.cpp vcs_report.cpp vcs_VolPhase.cpp \
vcs_dbocls.c vcs_dbolsm.c vcs_dbols.c vcs_dvout.c \
vcs_ivout.c vcs_dmout.c vcs_xerror.c
vcs_ivout.c vcs_dmout.c vcs_xerror.c vcs_solve_phaseStability.cpp
AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/ext/f2c_libs/
AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/ext/f2c_libs/
AM_CXXFLAGS = $(AM_CPPFLAGS)
lib_LTLIBRARIES = $(top_builddir)/build/lib/libequil.la
library_includedir = $(includedir)
#-----------------------
# Cantera Converters C/C++ library
# Cantera Equil C/C++ library
#-----------------------
__top_builddir__build_lib_libequil_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE)

9
src/numerics/Makefile.am
View file

@ -1,7 +1,8 @@
h_sources =
cc_sources = DenseMatrix.cpp funcs.cpp Func1.cpp ODE_integrators.cpp \
BandMatrix.cpp DAE_solvers.cpp CVodeInt.cpp \
SquareMatrix.cpp ResidJacEval.cpp NonlinearSolver.cpp
cc_sources = BEulerInt.cpp DenseMatrix.cpp funcs.cpp Func1.cpp ODE_integrators.cpp \
BandMatrix.cpp DAE_solvers.cpp CVodeInt.cpp GeneralMatrix.cpp \
SquareMatrix.cpp ResidJacEval.cpp NonlinearSolver.cpp IDA_Solver.cpp \
RootFind.cpp solveProb.cpp
AM_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_builddir)
AM_CXXFLAGS = $(AM_CPPFLAGS)
@ -10,7 +11,7 @@ lib_LTLIBRARIES = $(top_builddir)/build/lib/libctnumerics.la
library_includedir = $(includedir)
#-----------------------
# Cantera numerics C/C++ library
# Cantera Numerics C/C++ library
#-----------------------
__top_builddir__build_lib_libctnumerics_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE)

8
src/thermo/Makefile.am
View file

@ -1,10 +1,10 @@
h_sources =
cc_sources = Elements.cpp Phase.cpp \
cc_sources = Elements.cpp Phase.cpp RedlichKisterVPSSTP.cpp \
ThermoPhase.cpp IdealGasPhase.cpp ConstDensityThermo.cpp \
SpeciesThermoFactory.cpp ConstCpPoly.cpp Nasa9Poly1.cpp \
Nasa9PolyMultiTempRegion.cpp PDSS_Water.cpp PDSS_HKFT.cpp \
Mu0Poly.cpp GeneralSpeciesThermo.cpp SurfPhase.cpp \
ThermoFactory.cpp SpeciesThermoInterpType.cpp \
ThermoFactory.cpp SpeciesThermoInterpType.cpp \
VPSSMgr.cpp VPSSMgrFactory.cpp VPSSMgr_General.cpp \
IdealSolnGasVPSS.cpp MolalityVPSSTP.cpp VPStandardStateTP.cpp \
VPSSMgr_IdealGas.cpp VPSSMgr_ConstVol.cpp PDSS_ConstVol.cpp \
@ -18,7 +18,9 @@ cc_sources = Elements.cpp Phase.cpp \
IdealSolidSolnPhase.cpp LatticeSolidPhase.cpp \
SingleSpeciesTP.cpp MineralEQ3.cpp \
PseudoBinaryVPSSTP.cpp MargulesVPSSTP.cpp \
StoichSubstanceSSTP.cpp PureFluidPhase.cpp StoichSubstance.cpp
StoichSubstanceSSTP.cpp PureFluidPhase.cpp \
StoichSubstance.cpp
#PecosGasPhase.cpp
AM_CPPFLAGS = -I$(top_builddir)/include
AM_CXXFLAGS = $(AM_CPPFLAGS)

6
src/transport/Makefile.am
View file

@ -2,7 +2,11 @@ h_sources =
cc_sources = AqueousTransport.cpp LiquidTransport.cpp MMCollisionInt.cpp \
SimpleTransport.cpp TransportBase.cpp WaterTransport.cpp \
DustyGasTransport.cpp MixTransport.cpp MultiTransport.cpp \
SolidTransport.cpp TransportFactory.cpp
SolidTransport.cpp TransportFactory.cpp LTPspecies.cpp \
LiquidTranInteraction.cpp LiquidTransportData.cpp \
LiquidTransportParams.cpp TortuosityBase.cpp \
TortuosityBruggeman.cpp TortuosityMaxwell.cpp \
TortuosityPercolation.cpp TransportParams.cpp
AM_CPPFLAGS = -I$(top_builddir)/include
AM_CXXFLAGS = $(AM_CPPFLAGS)

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

@ -2,10 +2,10 @@ INC = -I. -I$(top_builddir)/include -I$(top_builddir)/test_prob
AM_CPPFLAGS = $(INC)
AM_CXXFLAGS = $(AM_CPPFLAGS)
#LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK = -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode
LINK += -lctlapack -lctblas -lctf2c -lm -lstdc++
#-lctcxx -luser
AM_LDFLAGS = -L$(top_builddir)/build/lib/
LIBS = $(LINK)