[cantera]: all files are now on the same (correct) linkage page

This commit is contained in:
Nicholas Malaya 2012-02-06 20:41:16 +00:00
parent c56b5f7b4d
commit f516af92cc
12 changed files with 27 additions and 27 deletions

View file

@ -3,10 +3,10 @@
#include <string>
#include "kernel/IdealGasPhase.h"
#include "kernel/GasKinetics.h"
#include "kernel/importKinetics.h"
#include "kernel/stringUtils.h"
#include "IdealGasPhase.h"
#include "GasKinetics.h"
#include "importKinetics.h"
#include "stringUtils.h"
namespace Cantera_CXX {

View file

@ -8,11 +8,11 @@
*/
#ifndef CT_EQUIL_INCL
#define CT_EQUIL_INCL
#include "kernel/equil.h"
#include "kernel/ChemEquil.h"
#include "kernel/MultiPhaseEquil.h"
#include "equil.h"
#include "ChemEquil.h"
#include "MultiPhaseEquil.h"
#ifdef WITH_VCSNONIDEAL
#include "kernel/vcs_MultiPhaseEquil.h"
#include "vcs_MultiPhaseEquil.h"
#endif
#endif

View file

@ -1,13 +1,13 @@
cc_sources = gri_matrix.cpp
INC = -I. -I$(top_builddir)/build/include/ -I$(top_builddir)/build/include/cantera -I$(top_builddir)/build/include/cantera/kernel
INC = -I. -I$(top_builddir)/build/include/
AM_CPPFLAGS = $(INC)
AM_CXXFLAGS = $(AM_CPPFLAGS)
LINK = -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode
LINK += -lctlapack -lctblas -lctf2c -lctcxx -lm -lctf2c -lstdc++
AM_LDFLAGS = -L/workspace/src/cantera/pecos_autotools/build/lib/
AM_LDFLAGS = -L$(top_builddir)/build/lib/
LIBS = $(LINK)
bin_PROGRAMS = gri_matrix

View file

@ -25,8 +25,8 @@
#include "Cantera.h"
#include "kernel/IdealSolidSolnPhase.h"
#include "kernel/IdealSolnGasVPSS.h"
#include "IdealSolidSolnPhase.h"
#include "IdealSolnGasVPSS.h"
#include <cstdio>

View file

@ -28,7 +28,7 @@
#include "IdealMolalSoln.h"
#else
#include "Cantera.h"
#include "kernel/IdealMolalSoln.h"
#include "IdealMolalSoln.h"
#endif
#include <cstdio>

View file

@ -1,13 +1,13 @@
cc_sources = IMSTester.cpp
INC = -I. -I$(top_builddir)/build/include/ -I$(top_builddir)/build/include/cantera -I$(top_builddir)/build/include/cantera/kernel
INC = -I$(top_builddir)/build/include/
AM_CPPFLAGS = $(INC)
AM_CXXFLAGS = $(AM_CPPFLAGS)
LINK = -lctcxx -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode
LINK += -lctlapack -lctblas -lctf2c -lm -lstdc++
AM_LDFLAGS = -L/workspace/src/cantera/pecos_autotools/build/lib/
AM_LDFLAGS = -L$(top_builddir)/build/lib/
LIBS = $(LINK)
bin_PROGRAMS = IMSTester

View file

@ -1,13 +1,13 @@
cc_sources = testIAPWSphi.cpp
INC = -I. -I$(top_builddir)/build/include/ -I$(top_builddir)/build/include/cantera -I$(top_builddir)/build/include/cantera/kernel
INC = -I$(top_builddir)/build/include/
AM_CPPFLAGS = $(INC)
AM_CXXFLAGS = $(AM_CPPFLAGS)
LINK = -lctcxx -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode
LINK += -lctlapack -lctblas -lctf2c -lm -lstdc++
AM_LDFLAGS = -L/workspace/src/cantera/pecos_autotools/build/lib/
AM_LDFLAGS = -L$(top_builddir)/build/lib/
LIBS = $(LINK)
bin_PROGRAMS = testIAPWSphi

View file

@ -1,13 +1,13 @@
cc_sources = testPress.cpp
INC = -I. -I$(top_builddir)/build/include/ -I$(top_builddir)/build/include/cantera -I$(top_builddir)/build/include/cantera/kernel
INC = -I$(top_builddir)/build/include/
AM_CPPFLAGS = $(INC)
AM_CXXFLAGS = $(AM_CPPFLAGS)
LINK = -lctcxx -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode
LINK += -lctlapack -lctblas -lctf2c -lm -lstdc++
AM_LDFLAGS = -L/workspace/src/cantera/pecos_autotools/build/lib/
AM_LDFLAGS = -L$(top_builddir)/build/lib/
LIBS = $(LINK)
bin_PROGRAMS = testPress

View file

@ -1,13 +1,13 @@
cc_sources = testTripleP.cpp
INC = -I. -I$(top_builddir)/build/include/ -I$(top_builddir)/build/include/cantera -I$(top_builddir)/build/include/cantera/kernel
INC = -I$(top_builddir)/build/include/
AM_CPPFLAGS = $(INC)
AM_CXXFLAGS = $(AM_CPPFLAGS)
LINK = -lctcxx -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode
LINK += -lctlapack -lctblas -lctf2c -lm -lstdc++
AM_LDFLAGS = -L/workspace/src/cantera/pecos_autotools/build/lib/
AM_LDFLAGS = -L$(top_builddir)/build/lib/
LIBS = $(LINK)
bin_PROGRAMS = testTripleP

View file

@ -1,13 +1,13 @@
cc_sources = testWaterPDSS.cpp
INC = -I. -I$(top_builddir)/build/include/ -I$(top_builddir)/build/include/cantera -I$(top_builddir)/build/include/cantera/kernel
INC = -I$(top_builddir)/build/include/
AM_CPPFLAGS = $(INC)
AM_CXXFLAGS = $(AM_CPPFLAGS)
LINK = -lctcxx -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode
LINK += -lctlapack -lctblas -lctf2c -lm -lstdc++
AM_LDFLAGS = -L/workspace/src/cantera/pecos_autotools/build/lib/
AM_LDFLAGS = -L$(top_builddir)/build/lib/
LIBS = $(LINK)
bin_PROGRAMS = testWaterPDSS

View file

@ -1,13 +1,13 @@
cc_sources = testWaterSSTP.cpp
INC = -I. -I$(top_builddir)/build/include/ -I$(top_builddir)/build/include/cantera -I$(top_builddir)/build/include/cantera/kernel
INC = -I$(top_builddir)/build/include/
AM_CPPFLAGS = $(INC)
AM_CXXFLAGS = $(AM_CPPFLAGS)
LINK = -lctcxx -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode
LINK += -lctlapack -lctblas -lctf2c -lm -lstdc++
AM_LDFLAGS = -L/workspace/src/cantera/pecos_autotools/build/lib/
AM_LDFLAGS = -L$(top_builddir)/build/lib/
LIBS = $(LINK)
bin_PROGRAMS = testWaterSSTP

View file

@ -1,13 +1,13 @@
cc_sources = wtWater.cpp
INC = -I. -I$(top_builddir)/build/include/ -I$(top_builddir)/build/include/cantera -I$(top_builddir)/build/include/cantera/kernel
INC = -I$(top_builddir)/build/include/
AM_CPPFLAGS = $(INC)
AM_CXXFLAGS = $(AM_CPPFLAGS)
LINK = -lctcxx -luser -loneD -lzeroD -lequil -lkinetics -ltransport -lthermo
LINK += -lctnumerics -lctmath -ltpx -lctspectra -lconverters -lctbase -lcvode
LINK += -lctlapack -lctblas -lctf2c -lm -lstdc++
AM_LDFLAGS = -L/workspace/src/cantera/pecos_autotools/build/lib/
AM_LDFLAGS = -L$(top_builddir)/build/lib/
LIBS = $(LINK)
bin_PROGRAMS = wtWater