From 653109129fe181f727ac123fcfffe11a8bfc1d28 Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Sat, 4 Apr 2009 03:27:43 +0000 Subject: [PATCH] Fixed equilibrium.h. vcs_MultiPhaseEquil.h needed to be conditionally included. Added more clean rules. --- Cantera/cxx/Makefile.in | 2 +- Cantera/cxx/include/equilibrium.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Cantera/cxx/Makefile.in b/Cantera/cxx/Makefile.in index 4c51656fc..9bac968f9 100644 --- a/Cantera/cxx/Makefile.in +++ b/Cantera/cxx/Makefile.in @@ -20,7 +20,7 @@ CXX_H = Cantera.h equilibrium.h IncompressibleSolid.h \ Metal.h PureFluid.h transport.h Edge.h \ IdealGasMix.h Interface.h numerics.h \ reactionpaths.h zerodim.h importPhase.h thermo.h \ - radiation.h spectra.h electrolyteThermo.h Cantera.mak + radiation.h spectra.h electrolyteThermo.h Cantera.mak Cantera_bt.mak all: @(cd include ; \ diff --git a/Cantera/cxx/include/equilibrium.h b/Cantera/cxx/include/equilibrium.h index 30c558bb2..1de354127 100755 --- a/Cantera/cxx/include/equilibrium.h +++ b/Cantera/cxx/include/equilibrium.h @@ -11,7 +11,9 @@ #include "kernel/equil.h" #include "kernel/ChemEquil.h" #include "kernel/MultiPhaseEquil.h" +#ifdef WITH_VCSNONIDEAL #include "kernel/vcs_MultiPhaseEquil.h" #endif +#endif