From 8d57c11eac8a6bbc1bb15973c55a785668cd0634 Mon Sep 17 00:00:00 2001 From: Nicholas Malaya Date: Tue, 19 Jun 2012 16:15:52 +0000 Subject: [PATCH] [cantera2.0]: fixing build order in kinetics, and adding correct configure.ac setup for tpx --- configure.ac | 1 + src/kinetics/Makefile.am | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 0c3c8a446..9157b39eb 100644 --- a/configure.ac +++ b/configure.ac @@ -163,6 +163,7 @@ AC_OUTPUT(Makefile \ src/transport/Makefile \ src/spectra/Makefile src/zeroD/Makefile \ src/equil/Makefile \ + src/tpx/Makefile \ cantera.pc) # skipped tests diff --git a/src/kinetics/Makefile.am b/src/kinetics/Makefile.am index a953becec..da5481f00 100644 --- a/src/kinetics/Makefile.am +++ b/src/kinetics/Makefile.am @@ -1,9 +1,9 @@ h_sources = -cc_sources = importKinetics.cpp GRI_30_Kinetics.cpp KineticsFactory.cpp \ - GasKinetics.cpp AqueousKinetics.cpp FalloffFactory.cpp \ - ReactionStoichMgr.cpp Kinetics.cpp solveSP.cpp \ - ReactionPath.cpp InterfaceKinetics.cpp ImplicitSurfChem.cpp \ - Group.cpp Kinetics.cpp +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 \ + importKinetics.cpp solveSP.cpp + AM_CPPFLAGS = -I$(top_builddir)/include/ AM_CXXFLAGS = $(AM_CPPFLAGS)