removing several deprecated header files from the makefile.ams. In addition, headers should now be properly installed by the make install step
This commit is contained in:
parent
3ce3da1fa2
commit
77bb5e15ce
10 changed files with 223 additions and 43 deletions
|
|
@ -5,7 +5,7 @@ SUBDIRS = ext src test_problems
|
|||
SUBDIRS += doc
|
||||
|
||||
# Distribute these directories:
|
||||
DISTDIRS = ext src test_problems doc
|
||||
DISTDIRS = ext src test_problems doc include
|
||||
|
||||
# generated documentation will be included in distributed archive
|
||||
EXTRA_DIST = bootstrap $(DX_CONFIG)
|
||||
|
|
|
|||
|
|
@ -1,22 +1,39 @@
|
|||
h_sources =
|
||||
cc_sources = BasisOptimize.cpp vcs_Gibbs.cpp vcs_root1d.cpp \
|
||||
ChemEquil.cpp vcs_rxnadj.cpp vcs_TP.cpp \
|
||||
equilibrate.cpp vcs_IntStarStar.cpp vcs_setMolesLinProg.cpp \
|
||||
MultiPhase.cpp vcs_MultiPhaseEquil.cpp vcs_solve.cpp \
|
||||
MultiPhaseEquil.cpp vcs_nondim.cpp vcs_solve_TP.cpp \
|
||||
vcs_DoubleStarStar.cpp vcs_phaseStability.cpp vcs_SpeciesProperties.cpp \
|
||||
vcs_elem.cpp vcs_prep.cpp vcs_species_thermo.cpp \
|
||||
vcs_elem_rearrange.cpp vcs_prob.cpp vcs_inest.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_solve_phaseStability.cpp
|
||||
h_sources = $(top_builddir)/include/cantera/equil/ChemEquil.h \
|
||||
$(top_builddir)/include/cantera/equil/vcs_internal.h \
|
||||
$(top_builddir)/include/cantera/equil/equil.h \
|
||||
$(top_builddir)/include/cantera/equil/vcs_defs.h \
|
||||
$(top_builddir)/include/cantera/equil/vcs_IntStarStar.h \
|
||||
$(top_builddir)/include/cantera/equil/MultiPhaseEquil.h \
|
||||
$(top_builddir)/include/cantera/equil/vcs_DoubleStarStar.h \
|
||||
$(top_builddir)/include/cantera/equil/vcs_MultiPhaseEquil.h \
|
||||
$(top_builddir)/include/cantera/equil/MultiPhase.h \
|
||||
$(top_builddir)/include/cantera/equil/vcs_prob.h \
|
||||
$(top_builddir)/include/cantera/equil/vcs_VolPhase.h \
|
||||
$(top_builddir)/include/cantera/equil/vcs_solve.h
|
||||
|
||||
# $(top_builddir)/include/cantera/equil/PropertyCalculator.h
|
||||
# $(top_builddir)/include/cantera/equil/vcs_SpeciesProperties.h
|
||||
# $(top_builddir)/include/cantera/equil/vcs_species_thermo.h
|
||||
# $(top_builddir)/include/cantera/equil/vcs_Exception.h
|
||||
|
||||
cc_sources = BasisOptimize.cpp vcs_Gibbs.cpp vcs_root1d.cpp \
|
||||
ChemEquil.cpp vcs_rxnadj.cpp vcs_TP.cpp \
|
||||
equilibrate.cpp vcs_IntStarStar.cpp vcs_setMolesLinProg.cpp \
|
||||
MultiPhase.cpp vcs_MultiPhaseEquil.cpp vcs_solve.cpp \
|
||||
MultiPhaseEquil.cpp vcs_nondim.cpp vcs_solve_TP.cpp \
|
||||
vcs_DoubleStarStar.cpp vcs_phaseStability.cpp vcs_SpeciesProperties.cpp \
|
||||
vcs_elem.cpp vcs_prep.cpp vcs_species_thermo.cpp \
|
||||
vcs_elem_rearrange.cpp vcs_prob.cpp vcs_inest.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_solve_phaseStability.cpp
|
||||
|
||||
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)
|
||||
lib_LTLIBRARIES = $(top_builddir)/build/lib/libequil.la
|
||||
library_includedir = $(includedir)
|
||||
|
||||
#-----------------------
|
||||
# Cantera Equil C/C++ library
|
||||
|
|
@ -26,4 +43,4 @@ __top_builddir__build_lib_libequil_la_LDFLAGS = $(all_libraries) -release $
|
|||
__top_builddir__build_lib_libequil_la_SOURCES = $(cc_sources) $(h_sources)
|
||||
|
||||
__top_builddir__build_lib_libequil_include_HEADERS = $(h_sources)
|
||||
__top_builddir__build_lib_libequil_includedir = $(prefix)/include
|
||||
__top_builddir__build_lib_libequil_includedir = $(prefix)/include/cantera/equil
|
||||
|
|
|
|||
|
|
@ -1,4 +1,28 @@
|
|||
h_sources =
|
||||
|
||||
h_sources = $(top_builddir)/include/cantera/kinetics/importKinetics.h \
|
||||
$(top_builddir)/include/cantera/kinetics/GRI_30_Kinetics.h \
|
||||
$(top_builddir)/include/cantera/kinetics/KineticsFactory.h \
|
||||
$(top_builddir)/include/cantera/kinetics/Kinetics.h \
|
||||
$(top_builddir)/include/cantera/kinetics/GasKinetics.h \
|
||||
$(top_builddir)/include/cantera/kinetics/FalloffFactory.h \
|
||||
$(top_builddir)/include/cantera/kinetics/ReactionStoichMgr.h \
|
||||
$(top_builddir)/include/cantera/kinetics/reaction_defs.h \
|
||||
$(top_builddir)/include/cantera/kinetics/FalloffMgr.h \
|
||||
$(top_builddir)/include/cantera/kinetics/ThirdBodyMgr.h \
|
||||
$(top_builddir)/include/cantera/kinetics/RateCoeffMgr.h \
|
||||
$(top_builddir)/include/cantera/kinetics/ReactionData.h \
|
||||
$(top_builddir)/include/cantera/kinetics/RxnRates.h \
|
||||
$(top_builddir)/include/cantera/kinetics/Enhanced3BConc.h \
|
||||
$(top_builddir)/include/cantera/kinetics/StoichManager.h \
|
||||
$(top_builddir)/include/cantera/kinetics/AqueousKinetics.h \
|
||||
$(top_builddir)/include/cantera/kinetics/InterfaceKinetics.h \
|
||||
$(top_builddir)/include/cantera/kinetics/Group.h \
|
||||
$(top_builddir)/include/cantera/kinetics/ReactionPath.h \
|
||||
$(top_builddir)/include/cantera/kinetics/EdgeKinetics.h
|
||||
|
||||
# $(top_builddir)/include/cantera/kinetics/solveSP.h
|
||||
# $(top_builddir)/include/cantera/kinetics/ImplicitSurfChem.h
|
||||
|
||||
cc_sources = AqueousKinetics.cpp FalloffFactory.cpp GRI_30_Kinetics.cpp \
|
||||
GasKinetics.cpp Group.cpp ImplicitSurfChem.cpp InterfaceKinetics.cpp \
|
||||
Kinetics.cpp KineticsFactory.cpp ReactionPath.cpp ReactionStoichMgr.cpp \
|
||||
|
|
@ -19,4 +43,4 @@ __top_builddir__build_lib_libkinetics_la_LDFLAGS = $(all_libraries) -releas
|
|||
__top_builddir__build_lib_libkinetics_la_SOURCES = $(cc_sources) $(h_sources)
|
||||
|
||||
__top_builddir__build_lib_libkinetics_include_HEADERS = $(h_sources)
|
||||
__top_builddir__build_lib_libkinetics_includedir = $(prefix)/include
|
||||
__top_builddir__build_lib_libkinetics_includedir = $(prefix)/include/cantera/base
|
||||
|
|
@ -1,9 +1,26 @@
|
|||
h_sources =
|
||||
h_sources = $(top_builddir)/include/cantera/numerics/DenseMatrix.h \
|
||||
$(top_builddir)/include/cantera/numerics/funcs.h \
|
||||
$(top_builddir)/include/cantera/numerics/ctlapack.h \
|
||||
$(top_builddir)/include/cantera/numerics/Func1.h \
|
||||
$(top_builddir)/include/cantera/numerics/FuncEval.h \
|
||||
$(top_builddir)/include/cantera/numerics/polyfit.h \
|
||||
$(top_builddir)/include/cantera/numerics/BandMatrix.h \
|
||||
$(top_builddir)/include/cantera/numerics/Integrator.h \
|
||||
$(top_builddir)/include/cantera/numerics/DAE_Solver.h \
|
||||
$(top_builddir)/include/cantera/numerics/ResidEval.h \
|
||||
$(top_builddir)/include/cantera/numerics/SquareMatrix.h \
|
||||
$(top_builddir)/include/cantera/numerics/ResidJacEval.h \
|
||||
$(top_builddir)/include/cantera/numerics/NonlinearSolver.h
|
||||
|
||||
# $(top_builddir)/include/cantera/numerics/ArrayViewer.h
|
||||
# $(top_builddir)/include/cantera/numerics/sort.h
|
||||
|
||||
# $(top_builddir)/include/cantera/numerics/CVodeInt.h
|
||||
|
||||
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
|
||||
#CVodesIntegrator.cpp
|
||||
|
||||
AM_CPPFLAGS = -I$(top_builddir)/include/ -I$(top_builddir)
|
||||
AM_CXXFLAGS = $(AM_CPPFLAGS)
|
||||
|
|
@ -19,4 +36,4 @@ __top_builddir__build_lib_libctnumerics_la_LDFLAGS = $(all_libraries) -rele
|
|||
__top_builddir__build_lib_libctnumerics_la_SOURCES = $(cc_sources) $(h_sources)
|
||||
|
||||
__top_builddir__build_lib_libctnumerics_include_HEADERS = $(h_sources)
|
||||
__top_builddir__build_lib_libctnumerics_includedir = $(prefix)/include
|
||||
__top_builddir__build_lib_libctnumerics_includedir = $(prefix)/include/cantera/numerics
|
||||
|
|
|
|||
|
|
@ -1,7 +1,19 @@
|
|||
h_sources = $(top_builddir)/include/cantera/oneD/Inlet1D.h \
|
||||
$(top_builddir)/include/cantera/oneD/MultiJac.h \
|
||||
$(top_builddir)/include/cantera/oneD/Sim1D.h \
|
||||
$(top_builddir)/include/cantera/oneD/StFlow.h \
|
||||
$(top_builddir)/include/cantera/oneD/Domain1D.h \
|
||||
$(top_builddir)/include/cantera/oneD/MultiNewton.h \
|
||||
$(top_builddir)/include/cantera/oneD/OneDim.h \
|
||||
$(top_builddir)/include/cantera/oneD/refine.h
|
||||
|
||||
# $(top_builddir)/include/cantera/oneD/Surf1D.h
|
||||
# $(top_builddir)/include/cantera/oneD/Resid1D.h
|
||||
# $(top_builddir)/include/cantera/oneD/Solid1D.h
|
||||
|
||||
cc_sources = MultiJac.cpp MultiNewton.cpp newton_utils.cpp OneDim.cpp \
|
||||
StFlow.cpp boundaries1D.cpp refine.cpp Sim1D.cpp Domain1D.cpp
|
||||
|
||||
h_sources =
|
||||
AM_CPPFLAGS = -I$(top_builddir)/include
|
||||
AM_CXXFLAGS = $(AM_CPPFLAGS) -fPIC
|
||||
|
||||
|
|
@ -16,4 +28,4 @@ __top_builddir__build_lib_liboneD_la_LDFLAGS = $(all_libraries) -release $(
|
|||
__top_builddir__build_lib_liboneD_la_SOURCES = $(cc_sources) $(h_sources)
|
||||
|
||||
__top_builddir__build_lib_liboneD_include_HEADERS = $(h_sources)
|
||||
__top_builddir__build_lib_liboneD_includedir = $(prefix)/include
|
||||
__top_builddir__build_lib_liboneD_includedir = $(prefix)/include/cantera/oneD
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
h_sources =
|
||||
|
||||
h_sources = $(top_builddir)/include/cantera/spectra/LineBroadener.h \
|
||||
$(top_builddir)/include/cantera/spectra/rotor.h
|
||||
# $(top_builddir)/include/cantera/spectra/spectralUtilities.h
|
||||
|
||||
cc_sources = LineBroadener.cpp rotor.cpp spectralUtilities.cpp
|
||||
|
||||
AM_CPPFLAGS = -I$(top_builddir)/include
|
||||
|
|
@ -13,3 +17,6 @@ library_includedir = $(includedir)
|
|||
|
||||
__top_builddir__build_lib_libctspectra_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE)
|
||||
__top_builddir__build_lib_libctspectra_la_SOURCES = $(cc_sources) $(h_sources)
|
||||
|
||||
__top_builddir__build_lib_libctspectra_include_HEADERS = $(h_sources)
|
||||
__top_builddir__build_lib_libctspectra_includedir = $(prefix)/include/cantera/spectra
|
||||
|
|
|
|||
|
|
@ -1,4 +1,75 @@
|
|||
h_sources =
|
||||
h_sources = $(top_builddir)/include/cantera/thermo/Elements.h \
|
||||
$(top_builddir)/include/cantera/thermo/Phase.h \
|
||||
$(top_builddir)/include/cantera/thermo/mix_defs.h \
|
||||
$(top_builddir)/include/cantera/thermo/ThermoPhase.h \
|
||||
$(top_builddir)/include/cantera/thermo/IdealGasPhase.h \
|
||||
$(top_builddir)/include/cantera/thermo/ConstDensityThermo.h \
|
||||
$(top_builddir)/include/cantera/thermo/SpeciesThermoFactory.h \
|
||||
$(top_builddir)/include/cantera/thermo/ThermoFactory.h \
|
||||
$(top_builddir)/include/cantera/thermo/NasaPoly1.h \
|
||||
$(top_builddir)/include/cantera/thermo/Nasa9Poly1.h \
|
||||
$(top_builddir)/include/cantera/thermo/WaterPropsIAPWS.h\
|
||||
$(top_builddir)/include/cantera/thermo/SimpleThermo.h \
|
||||
$(top_builddir)/include/cantera/thermo/SpeciesThermoInterpType.h \
|
||||
$(top_builddir)/include/cantera/thermo/VPSSMgr_Water_ConstVol.h \
|
||||
$(top_builddir)/include/cantera/thermo/GeneralSpeciesThermo.h \
|
||||
$(top_builddir)/include/cantera/thermo/Mu0Poly.h \
|
||||
$(top_builddir)/include/cantera/thermo/speciesThermoTypes.h \
|
||||
$(top_builddir)/include/cantera/thermo/SpeciesThermo.h \
|
||||
$(top_builddir)/include/cantera/thermo/SurfPhase.h \
|
||||
$(top_builddir)/include/cantera/thermo/EdgePhase.h \
|
||||
$(top_builddir)/include/cantera/thermo/IdealSolnGasVPSS.h \
|
||||
$(top_builddir)/include/cantera/thermo/MolalityVPSSTP.h \
|
||||
$(top_builddir)/include/cantera/thermo/VPSSMgr.h \
|
||||
$(top_builddir)/include/cantera/thermo/VPSSMgr_General.h \
|
||||
$(top_builddir)/include/cantera/thermo/VPSSMgr_IdealGas.h \
|
||||
$(top_builddir)/include/cantera/thermo/VPSSMgr_ConstVol.h \
|
||||
$(top_builddir)/include/cantera/thermo/PDSS_ConstVol.h \
|
||||
$(top_builddir)/include/cantera/thermo/PDSS_IdealGas.h \
|
||||
$(top_builddir)/include/cantera/thermo/PDSS_SSVol.h \
|
||||
$(top_builddir)/include/cantera/thermo/DebyeHuckel.h \
|
||||
$(top_builddir)/include/cantera/thermo/VPStandardStateTP.h \
|
||||
$(top_builddir)/include/cantera/thermo/PDSS_Water.h \
|
||||
$(top_builddir)/include/cantera/thermo/WaterProps.h \
|
||||
$(top_builddir)/include/cantera/thermo/WaterPropsIAPWSphi.h \
|
||||
$(top_builddir)/include/cantera/thermo/VPSSMgr_Water_HKFT.h \
|
||||
$(top_builddir)/include/cantera/thermo/PDSS_HKFT.h \
|
||||
$(top_builddir)/include/cantera/thermo/PDSS_IonsFromNeutral.h \
|
||||
$(top_builddir)/include/cantera/thermo/IonsFromNeutralVPSSTP.h \
|
||||
$(top_builddir)/include/cantera/thermo/GibbsExcessVPSSTP.h \
|
||||
$(top_builddir)/include/cantera/thermo/LatticePhase.h \
|
||||
$(top_builddir)/include/cantera/thermo/IdealMolalSoln.h \
|
||||
$(top_builddir)/include/cantera/thermo/PDSS.h \
|
||||
$(top_builddir)/include/cantera/thermo/HMWSoln.h \
|
||||
$(top_builddir)/include/cantera/thermo/WaterSSTP.h \
|
||||
$(top_builddir)/include/cantera/thermo/MetalSHEelectrons.h \
|
||||
$(top_builddir)/include/cantera/thermo/IdealSolidSolnPhase.h \
|
||||
$(top_builddir)/include/cantera/thermo/StoichSubstanceSSTP.h \
|
||||
$(top_builddir)/include/cantera/thermo/SingleSpeciesTP.h \
|
||||
$(top_builddir)/include/cantera/thermo/MineralEQ3.h \
|
||||
$(top_builddir)/include/cantera/thermo/PseudoBinaryVPSSTP.h \
|
||||
$(top_builddir)/include/cantera/thermo/MargulesVPSSTP.h \
|
||||
$(top_builddir)/include/cantera/thermo/StoichSubstance.h \
|
||||
$(top_builddir)/include/cantera/thermo/electrolytes.h \
|
||||
$(top_builddir)/include/cantera/thermo/PureFluidPhase.h \
|
||||
$(top_builddir)/include/cantera/thermo/LatticeSolidPhase.h \
|
||||
$(top_builddir)/include/cantera/thermo/MetalPhase.h \
|
||||
$(top_builddir)/include/cantera/thermo/SpeciesThermoMgr.h \
|
||||
$(top_builddir)/include/cantera/thermo/StatMech.h
|
||||
|
||||
#$(top_builddir)/include/cantera/thermo/State.h
|
||||
# $(top_builddir)/include/cantera/thermo/Constituents.h
|
||||
# $(top_builddir)/include/cantera/thermo/NasaPoly2.h
|
||||
# $(top_builddir)/include/cantera/thermo/NasaThermo.h
|
||||
# $(top_builddir)/include/cantera/thermo/Nasa9PolyMultiTempRegion.h
|
||||
# $(top_builddir)/include/cantera/thermo/ShomateThermo.h
|
||||
# $(top_builddir)/include/cantera/thermo/ShomatePoly.h
|
||||
# $(top_builddir)/include/cantera/thermo/ConstCpPoly.h
|
||||
# $(top_builddir)/include/cantera/thermo/VPSSMgrFactory.h
|
||||
# $(top_builddir)/include/cantera/thermo/VPSSMgr_types.h
|
||||
# $(top_builddir)/include/cantera/thermo/PecosGasPhase.h
|
||||
|
||||
|
||||
cc_sources = ConstCpPoly.cpp ConstDensityThermo.cpp DebyeHuckel.cpp \
|
||||
Elements.cpp FixedChemPotSSTP.cpp GeneralSpeciesThermo.cpp \
|
||||
GibbsExcessVPSSTP.cpp HMWSoln.cpp HMWSoln_input.cpp \
|
||||
|
|
@ -14,9 +85,9 @@ cc_sources = ConstCpPoly.cpp ConstDensityThermo.cpp DebyeHuckel.cpp \
|
|||
Phase.cpp PhaseCombo_Interaction.cpp PseudoBinaryVPSSTP.cpp \
|
||||
PureFluidPhase.cpp RedlichKisterVPSSTP.cpp \
|
||||
RedlichKwongMFTP.cpp SemiconductorPhase.cpp SingleSpeciesTP.cpp \
|
||||
SpeciesThermoFactory.cpp SpeciesThermoInterpType.cpp \
|
||||
StoichSubstance.cpp SurfPhase.cpp ThermoPhase.cpp \
|
||||
StoichSubstanceSSTP.cpp ThermoFactory.cpp VPSSMgr.cpp \
|
||||
SpeciesThermoFactory.cpp SpeciesThermoInterpType.cpp \
|
||||
StoichSubstance.cpp SurfPhase.cpp ThermoPhase.cpp \
|
||||
StoichSubstanceSSTP.cpp ThermoFactory.cpp VPSSMgr.cpp \
|
||||
VPSSMgrFactory.cpp VPSSMgr_ConstVol.cpp VPSSMgr_General.cpp \
|
||||
VPSSMgr_IdealGas.cpp VPSSMgr_Water_ConstVol.cpp \
|
||||
VPSSMgr_Water_HKFT.cpp VPStandardStateTP.cpp WaterProps.cpp \
|
||||
|
|
@ -24,11 +95,11 @@ cc_sources = ConstCpPoly.cpp ConstDensityThermo.cpp DebyeHuckel.cpp \
|
|||
StatMech.cpp
|
||||
|
||||
|
||||
AM_CPPFLAGS = -I$(top_builddir)/include
|
||||
AM_CXXFLAGS = $(AM_CPPFLAGS)
|
||||
AM_CPPFLAGS = -I$(top_builddir)/include
|
||||
AM_CXXFLAGS = $(AM_CPPFLAGS)
|
||||
|
||||
lib_LTLIBRARIES = $(top_builddir)/build/lib/libthermo.la
|
||||
library_includedir = $(includedir)
|
||||
lib_LTLIBRARIES = $(top_builddir)/build/lib/libthermo.la
|
||||
library_includedir = $(includedir)
|
||||
|
||||
#-----------------------
|
||||
# Cantera thermo C/C++ library
|
||||
|
|
@ -38,4 +109,4 @@ __top_builddir__build_lib_libthermo_la_LDFLAGS = $(all_libraries) -release
|
|||
__top_builddir__build_lib_libthermo_la_SOURCES = $(cc_sources) $(h_sources)
|
||||
|
||||
__top_builddir__build_lib_libthermo_include_HEADERS = $(h_sources)
|
||||
__top_builddir__build_lib_libthermo_includedir = $(prefix)/include
|
||||
__top_builddir__build_lib_libthermo_includedir = $(prefix)/include/cantera/thermo
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
h_sources =
|
||||
cc_sources = Methane.cpp Nitrogen.cpp Oxygen.cpp Water.cpp Hydrogen.cpp RedlichKwong.cpp \
|
||||
CarbonDioxide.cpp Heptane.cpp lk.cpp Sub.cpp utils.cpp HFC134a.cpp
|
||||
h_sources = $(top_builddir)/include/cantera/tpx/Sub.h \
|
||||
$(top_builddir)/include/cantera/tpx/utils.h
|
||||
|
||||
AM_CPPFLAGS = -I$(top_builddir)/include
|
||||
AM_CXXFLAGS = $(AM_CPPFLAGS)
|
||||
cc_sources = Methane.cpp Nitrogen.cpp Oxygen.cpp Water.cpp Hydrogen.cpp RedlichKwong.cpp \
|
||||
CarbonDioxide.cpp Heptane.cpp lk.cpp Sub.cpp utils.cpp HFC134a.cpp
|
||||
|
||||
AM_CPPFLAGS = -I$(top_builddir)/include
|
||||
AM_CXXFLAGS = $(AM_CPPFLAGS)
|
||||
|
||||
lib_LTLIBRARIES = $(top_builddir)/build/lib/libtpx.la
|
||||
library_includedir = $(top_builddir)/build/include
|
||||
|
|
@ -17,4 +19,6 @@ __top_builddir__build_lib_libtpx_la_LDFLAGS = $(all_libraries) -release $(G
|
|||
__top_builddir__build_lib_libtpx_la_SOURCES = $(cc_sources) $(h_sources)
|
||||
|
||||
__top_builddir__build_lib_libtpx_include_HEADERS = $(h_sources)
|
||||
__top_builddir__build_lib_libtpx_includedir = $(prefix)/include
|
||||
__top_builddir__build_lib_libtpx_includedir = $(prefix)/include/cantera/tpx
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,21 @@
|
|||
h_sources =
|
||||
h_sources = $(top_builddir)/include/cantera/transport/AqueousTransport.h \
|
||||
$(top_builddir)/include/cantera/transport/LiquidTransportData.h \
|
||||
$(top_builddir)/include/cantera/transport/MultiTransport.h \
|
||||
$(top_builddir)/include/cantera/transport/TransportBase.h \
|
||||
$(top_builddir)/include/cantera/transport/WaterTransport.h \
|
||||
$(top_builddir)/include/cantera/transport/DustyGasTransport.h \
|
||||
$(top_builddir)/include/cantera/transport/LiquidTransport.h \
|
||||
$(top_builddir)/include/cantera/transport/MixTransport.h \
|
||||
$(top_builddir)/include/cantera/transport/SimpleTransport.h \
|
||||
$(top_builddir)/include/cantera/transport/TransportFactory.h \
|
||||
$(top_builddir)/include/cantera/transport/LiquidTransportParams.h \
|
||||
$(top_builddir)/include/cantera/transport/SolidTransport.h \
|
||||
$(top_builddir)/include/cantera/transport/TransportParams.h \
|
||||
$(top_builddir)/include/cantera/transport/PecosTransport.h
|
||||
|
||||
# $(top_builddir)/include/cantera/transport/L_matrix.h
|
||||
# $(top_builddir)/include/cantera/transport/FtnTransport.h
|
||||
# $(top_builddir)/include/cantera/transport/MMCollisionInt.h
|
||||
cc_sources = AqueousTransport.cpp LiquidTransport.cpp MMCollisionInt.cpp \
|
||||
SimpleTransport.cpp TransportBase.cpp WaterTransport.cpp \
|
||||
DustyGasTransport.cpp MixTransport.cpp MultiTransport.cpp \
|
||||
|
|
@ -23,4 +40,4 @@ __top_builddir__build_lib_libtransport_la_LDFLAGS = $(all_libraries) -relea
|
|||
__top_builddir__build_lib_libtransport_la_SOURCES = $(cc_sources) $(h_sources)
|
||||
|
||||
__top_builddir__build_lib_libtransport_include_HEADERS = $(h_sources)
|
||||
__top_builddir__build_lib_libtransport_includedir = $(prefix)/include
|
||||
__top_builddir__build_lib_libtransport_includedir = $(prefix)/include/cantera/transport
|
||||
|
|
|
|||
|
|
@ -1,4 +1,15 @@
|
|||
h_sources =
|
||||
h_sources = $(top_builddir)/include/cantera/zeroD/Reactor.h \
|
||||
$(top_builddir)/include/cantera/zeroD/ReactorBase.h \
|
||||
$(top_builddir)/include/cantera/zeroD/FlowDevice.h \
|
||||
$(top_builddir)/include/cantera/zeroD/Wall.h \
|
||||
$(top_builddir)/include/cantera/zeroD/ReactorNet.h \
|
||||
$(top_builddir)/include/cantera/zeroD/flowControllers.h \
|
||||
$(top_builddir)/include/cantera/zeroD/PID_Controller.h \
|
||||
$(top_builddir)/include/cantera/zeroD/Reservoir.h \
|
||||
$(top_builddir)/include/cantera/zeroD/FlowReactor.h \
|
||||
$(top_builddir)/include/cantera/zeroD/ConstPressureReactor.h \
|
||||
$(top_builddir)/include/cantera/zeroD/ReactorFactory.h
|
||||
|
||||
cc_sources = Reactor.cpp ReactorBase.cpp FlowDevice.cpp Wall.cpp \
|
||||
ReactorNet.cpp FlowReactor.cpp ConstPressureReactor.cpp \
|
||||
ReactorFactory.cpp
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue