research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[cantera]: updating from includes to AM_CPPFLAGS

Browse source
This commit is contained in:
Nicholas Malaya 2012-01-18 17:39:12 +00:00
parent 2fd3ae6598
commit 6de0d5e7f4
19 changed files with 43 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cantera/src/base/Makefile.am
View file

@ -9,8 +9,8 @@ cc_sources = ct2ctml.cpp ctml.cpp misc.cpp plots.cpp \
PrintCtrl.cpp LogPrintCtrl.cpp mdp_allo.cpp \
checkFinite.cpp
INCLUDES =
AM_CXXFLAGS = $(INCLUDES)
AM_CPPFLAGS =
AM_CXXFLAGS = $(AM_CPPFLAGS)
lib_LTLIBRARIES = $(top_builddir)/build/lib/libctbase.la
library_includedir = $(top_builddir)/build/include

4
Cantera/src/converters/Makefile.am
View file

@ -6,8 +6,8 @@ cc_sources = atomicWeightDB.cpp ck2ctml.cpp CKReader.cpp filter.cpp \
Reaction.cpp thermoFunctions.cpp ck2ct.cpp CKParser.cpp \
ckr_utils.cpp NASA9Parser.cpp Species.cpp writelog.cpp
INCLUDES = -I../base -I../../../
AM_CXXFLAGS = $(INCLUDES)
AM_CPPFLAGS = -I../base -I../../../
AM_CXXFLAGS = $(AM_CPPFLAGS)
lib_LTLIBRARIES = $(top_builddir)/build/lib/libconverters.la
library_includedir = $(includedir)

6
Cantera/src/equil/Makefile.am
View file

@ -4,9 +4,9 @@ h_sources = ChemEquil.h MultiPhase.h MultiPhaseEquil.h equil.h \
cc_sources = BasisOptimize.cpp ChemEquil.cpp MultiPhase.cpp \
MultiPhaseEquil.cpp equilibrate.cpp
INCLUDES = -I../base -I../thermo -I../numerics -I../../../
INCLUDES += -I../../../ext/f2c_libs/
AM_CXXFLAGS = $(INCLUDES)
AM_CPPFLAGS = -I../base -I../thermo -I../numerics -I../../../
AM_CPPFLAGS += -I../../../ext/f2c_libs/
AM_CXXFLAGS = $(AM_CPPFLAGS)
lib_LTLIBRARIES = $(top_builddir)/build/lib/libequil.la
library_includedir = $(includedir)

4
Cantera/src/kinetics/Makefile.am
View file

@ -9,8 +9,8 @@ cc_sources = importKinetics.cpp GRI_30_Kinetics.cpp KineticsFactory.cpp \
GasKinetics.cpp AqueousKinetics.cpp FalloffFactory.cpp
ReactionStoichMgr.cpp Kinetics.cpp solveSP.cpp
INCLUDES = -I../base -I../thermo -I../../../
AM_CXXFLAGS = $(INCLUDES)
AM_CPPFLAGS = -I../base -I../thermo -I../../../
AM_CXXFLAGS = $(AM_CPPFLAGS)
lib_LTLIBRARIES = $(top_builddir)/build/lib/libkinetics.la
library_includedir = $(includedir)

4
Cantera/src/numerics/Makefile.am
View file

@ -8,8 +8,8 @@ cc_sources = DenseMatrix.cpp funcs.cpp Func1.cpp ODE_integrators.cpp \
BandMatrix.cpp DAE_solvers.cpp sort.cpp \
SquareMatrix.cpp ResidJacEval.cpp NonlinearSolver.cpp
INCLUDES = -I../base -I../../../
AM_CXXFLAGS = $(INCLUDES)
AM_CPPFLAGS = -I../base -I../../../
AM_CXXFLAGS = $(AM_CPPFLAGS)
lib_LTLIBRARIES = $(top_builddir)/build/lib/libctnumerics.la
library_includedir = $(includedir)

4
Cantera/src/oneD/Makefile.am
View file

@ -5,8 +5,8 @@ h_sources = Inlet1D.h MultiJac.h Sim1D.h StFlow.h \
Surf1D.h Domain1D.h MultiNewton.h OneDim.h \
Resid1D.h Solid1D.h efine.h
INCLUDES = -I../base -I../thermo -I../kinetics -I../transport -I../numerics -I../../../
AM_CXXFLAGS = $(INCLUDES) -fPIC
AM_CPPFLAGS = -I../base -I../thermo -I../kinetics -I../transport -I../numerics -I../../../
AM_CXXFLAGS = $(AM_CPPFLAGS) -fPIC
lib_LTLIBRARIES = $(top_builddir)/build/lib/liboneD.la
library_includedir = $(includedir)

4
Cantera/src/spectra/Makefile.am
View file

@ -3,8 +3,8 @@ h_sources = DiatomicMolecule.h LineBroadener.h Nuclei.h \
cc_sources = LineBroadener.cpp rotor.cpp spectralUtilities.cpp
INCLUDES = -I../base -I../../../
AM_CXXFLAGS = $(INCLUDES)
AM_CPPFLAGS = -I../base -I../../../
AM_CXXFLAGS = $(AM_CPPFLAGS)
lib_LTLIBRARIES = $(top_builddir)/build/lib/libctspectra.la
library_includedir = $(includedir)

4
Cantera/src/thermo/Makefile.am
View file

@ -24,8 +24,8 @@ cc_sources = State.cpp Elements.cpp Constituents.cpp Phase.cpp \
VPSSMgr_IdealGas.cpp VPSSMgr_ConstVol.cpp PDSS_ConstVol.cpp \
PDSS_IdealGas.cpp PDSS_SSVol.cpp
INCLUDES = -I../base -I../../../
AM_CXXFLAGS = $(INCLUDES)
AM_CPPFLAGS = -I../base -I../../../
AM_CXXFLAGS = $(AM_CPPFLAGS)
lib_LTLIBRARIES = $(top_builddir)/build/lib/libthermo.la
library_includedir = $(includedir)

4
Cantera/src/transport/Makefile.am
View file

@ -10,8 +10,8 @@ cc_sources = AqueousTransport.cpp LiquidTransport.cpp MMCollisionInt.cpp \
DustyGasTransport.cpp MixTransport.cpp MultiTransport.cpp \
SolidTransport.cpp TransportFactory.cpp
INCLUDES = -I../base -I../thermo -I../numerics -I../../../
AM_CXXFLAGS = $(INCLUDES)
AM_CPPFLAGS = -I../base -I../thermo -I../numerics -I../../../
AM_CXXFLAGS = $(AM_CPPFLAGS)
lib_LTLIBRARIES = $(top_builddir)/build/lib/libtransport.la
library_includedir = $(includedir)

4
Cantera/src/zeroD/Makefile.am
View file

@ -6,8 +6,8 @@ cc_sources = Reactor.cpp ReactorBase.cpp FlowDevice.cpp Wall.cpp \
ReactorNet.cpp FlowReactor.cpp ConstPressureReactor.cpp \
ReactorFactory.cpp
INCLUDES = -I../base -I../thermo -I../kinetics -I../numerics -I../../../
AM_CXXFLAGS = $(INCLUDES)
AM_CPPFLAGS = -I../base -I../thermo -I../kinetics -I../numerics -I../../../
AM_CXXFLAGS = $(AM_CPPFLAGS)
lib_LTLIBRARIES = $(top_builddir)/build/lib/libzeroD.la
library_includedir = $(includedir)

4
Cantera/user/Makefile.am
View file

@ -1,7 +1,7 @@
cc_sources = user.cpp
INCLUDES = -I$(top_builddir)/build/include/ -I$(top_builddir)/build/include/cantera
AM_CXXFLAGS = $(INCLUDES)
AM_CPPFLAGS = -I$(top_builddir)/build/include/ -I$(top_builddir)/build/include/cantera
AM_CXXFLAGS = $(AM_CPPFLAGS)
lib_LTLIBRARIES = $(top_builddir)/build/lib/libuser.la
library_includedir = $(top_builddir)/build/include

3
configure.ac
View file

@ -3,11 +3,10 @@
AC_PREREQ(2.61)
AC_INIT([cantera], [1.8.0], [nick@ices.utexas.edu])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADER(config.h)
AC_CONFIG_AUX_DIR([build-aux])
AX_ENABLE_BUILDDIR
AM_INIT_AUTOMAKE
AM_INIT_AUTOMAKE(-Wall -Werror)
# snarf and provide versioning numbers
AX_SPLIT_VERSION

4
examples/cxx/Makefile.am
View file

@ -13,8 +13,8 @@ LINK += -lctblas
LIBS = -L$(top_builddir)/build/lib/ $(LINK)
INCLUDES = -I../base -I$(top_builddir)/build/include/ -I$(top_builddir)/build/include/cantera
AM_CXXFLAGS = $(INCLUDES)
AM_CPPFLAGS = -I../base -I$(top_builddir)/build/include/ -I$(top_builddir)/build/include/cantera
AM_CXXFLAGS = $(AM_CPPFLAGS)
bin_PROGRAMS = cxx_examples
library_includedir = $(includedir)

6
ext/blas/Makefile.am
View file

@ -6,9 +6,9 @@ fc_sources = dasum.f dcabs1.f ddot.f dgemm.f dger.f drot.f drotm.f
dspr.f dsymm.f dsyr2.f dsyr.f dtbmv.f dtpmv.f dtrmm.f \
dtrsm.f dzasum.f icamax.f isamax.f lsame.f
INCLUDES =
AM_CXXFLAGS = $(INCLUDES)
AM_FCFLAGS = $(INCLUDES)
AM_CPPFLAGS =
AM_CXXFLAGS = $(AM_CPPFLAGS)
AM_FCFLAGS = $(AM_CPPFLAGS)
lib_LTLIBRARIES = $(top_builddir)/build/lib/libctblas.la
library_includedir = $(top_builddir)/build/include

6
ext/cvode/Makefile.am
View file

@ -7,9 +7,9 @@ h_sources = band.h cvband.h cvbandpre.h cvdense.h cvdiag.h \
llnltyps.h nvector.h spgmr.h
INCLUDES =
AM_CXXFLAGS = $(INCLUDES)
AM_FCFLAGS = $(INCLUDES)
AM_CPPFLAGS =
AM_CXXFLAGS = $(AM_CPPFLAGS)
AM_FCFLAGS = $(AM_CPPFLAGS)
lib_LTLIBRARIES = $(top_builddir)/build/lib/libcvode.la
library_includedir = $(top_builddir)/build/include

6
ext/f2c_libs/Makefile.am
View file

@ -36,9 +36,9 @@ cc_sources = abort_.c c_log.c d_atn2.c dfe.c d_prod.c \
h_sources = f2c.h fio.h fmt.h fp.h lio.h rawio.h sysdep1.h
INCLUDES =
AM_CXXFLAGS = $(INCLUDES)
AM_FCFLAGS = $(INCLUDES)
AM_CPPFLAGS =
AM_CXXFLAGS = $(AM_CPPFLAGS)
AM_FCFLAGS = $(AM_CPPFLAGS)
lib_LTLIBRARIES = $(top_builddir)/build/lib/libctf2c.la
library_includedir = $(top_builddir)/build/include

6
ext/lapack/Makefile.am
View file

@ -10,9 +10,9 @@ fc_sources = dbdsqr.f dgbtrf.f dgbtf2.f dgbtrs.f dgbsv.f \
dormbr.f dorml2.f dormlq.f dormqr.f drscl.f \
ilaenv.f
INCLUDES =
AM_CXXFLAGS = $(INCLUDES)
AM_FCFLAGS = $(INCLUDES)
AM_CPPFLAGS =
AM_CXXFLAGS = $(AM_CPPFLAGS)
AM_FCFLAGS = $(AM_CPPFLAGS)
lib_LTLIBRARIES = $(top_builddir)/build/lib/libctlapack.la
library_includedir = $(top_builddir)/build/include

6
ext/math/Makefile.am
View file

@ -6,9 +6,9 @@ fc_sources = ddaspk.f dgbfa.f dgbsl.f \
polfit.f pvalue.f xercnt.f xerhlt.f \
xermsg.f xerprn.f xersve.f xgetua.f
INCLUDES =
AM_CXXFLAGS = $(INCLUDES)
AM_FCFLAGS = $(INCLUDES)
AM_CPPFLAGS =
AM_CXXFLAGS = $(AM_CPPFLAGS)
AM_FCFLAGS = $(AM_CPPFLAGS)
lib_LTLIBRARIES = $(top_builddir)/build/lib/libctmath.la
library_includedir = $(top_builddir)/build/include

4
ext/tpx/Makefile.am
View file

@ -4,8 +4,8 @@ h_sources = Methane.h Nitrogen.h Oxygen.h Water.h Hydrogen.h Redli
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
INCLUDES =
AM_CXXFLAGS = $(INCLUDES)
AM_CPPFLAGS =
AM_CXXFLAGS = $(AM_CPPFLAGS)
lib_LTLIBRARIES = $(top_builddir)/build/lib/libtpx.la
library_includedir = $(top_builddir)/build/include