From 32265923dd42a2bbad9ed9bd8ad4945996250f13 Mon Sep 17 00:00:00 2001 From: Nicholas Malaya Date: Mon, 6 Feb 2012 18:06:25 +0000 Subject: [PATCH] [cantera]: fixing a small bug with respect to the config.h header --- Cantera/src/base/Makefile.am | 2 +- Cantera/src/numerics/Makefile.am | 11 +++++------ Makefile.am | 3 ++- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cantera/src/base/Makefile.am b/Cantera/src/base/Makefile.am index 9fdd4fca8..086783d52 100644 --- a/Cantera/src/base/Makefile.am +++ b/Cantera/src/base/Makefile.am @@ -2,7 +2,7 @@ h_sources = utilities.h ct_defs.h ctexceptions.h logger.h \ ctml.h plots.h stringUtils.h xml.h \ Array.h vec_functions.h global.h XML_Writer.h \ FactoryBase.h clockWC.h PrintCtrl.h \ - LogPrintCtrl.h mdp_allo.h config.h + LogPrintCtrl.h mdp_allo.h cc_sources = ct2ctml.cpp ctml.cpp misc.cpp plots.cpp \ stringUtils.cpp xml.cpp clockWC.cpp \ diff --git a/Cantera/src/numerics/Makefile.am b/Cantera/src/numerics/Makefile.am index 40d3de7dc..3fcf0ebe9 100644 --- a/Cantera/src/numerics/Makefile.am +++ b/Cantera/src/numerics/Makefile.am @@ -1,12 +1,11 @@ h_sources = ArrayViewer.h DenseMatrix.h funcs.h ctlapack.h Func1.h \ - FuncEval.h polyfit.h \ - BandMatrix.h Integrator.h DAE_Solver.h ResidEval.h sort.h \ - SquareMatrix.h ResidJacEval.h NonlinearSolver.h CVodeInt.h + FuncEval.h polyfit.h BandMatrix.h Integrator.h \ + DAE_Solver.h ResidEval.h sort.h SquareMatrix.h \ + ResidJacEval.h NonlinearSolver.h CVodeInt.h cc_sources = DenseMatrix.cpp funcs.cpp Func1.cpp ODE_integrators.cpp \ - BandMatrix.cpp DAE_solvers.cpp sort.cpp \ - SquareMatrix.cpp ResidJacEval.cpp NonlinearSolver.cpp \ - CVodeInt.cpp + BandMatrix.cpp DAE_solvers.cpp sort.cpp CVodeInt.cpp \ + SquareMatrix.cpp ResidJacEval.cpp NonlinearSolver.cpp AM_CPPFLAGS = -I$(top_builddir)/build/include/ -I$(top_builddir)/Cantera/ext/cvode -I$(top_builddir) AM_CXXFLAGS = $(AM_CPPFLAGS) diff --git a/Makefile.am b/Makefile.am index 532af4e31..be53dcb17 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,4 +9,5 @@ SUBDIRS += doxygen DIST_SUBDIRS = Cantera examples # generated documentation will be included in distributed archive -EXTRA_DIST= bootstrap $(DX_CONFIG) \ No newline at end of file +EXTRA_DIST= bootstrap $(DX_CONFIG) +