From 6de0d5e7f4deee4f6c9521fe4337073b72f62b7e Mon Sep 17 00:00:00 2001 From: Nicholas Malaya Date: Wed, 18 Jan 2012 17:39:12 +0000 Subject: [PATCH] [cantera]: updating from includes to AM_CPPFLAGS --- Cantera/src/base/Makefile.am | 4 ++-- Cantera/src/converters/Makefile.am | 4 ++-- Cantera/src/equil/Makefile.am | 6 +++--- Cantera/src/kinetics/Makefile.am | 4 ++-- Cantera/src/numerics/Makefile.am | 4 ++-- Cantera/src/oneD/Makefile.am | 4 ++-- Cantera/src/spectra/Makefile.am | 4 ++-- Cantera/src/thermo/Makefile.am | 4 ++-- Cantera/src/transport/Makefile.am | 4 ++-- Cantera/src/zeroD/Makefile.am | 4 ++-- Cantera/user/Makefile.am | 4 ++-- configure.ac | 3 +-- examples/cxx/Makefile.am | 4 ++-- ext/blas/Makefile.am | 6 +++--- ext/cvode/Makefile.am | 6 +++--- ext/f2c_libs/Makefile.am | 6 +++--- ext/lapack/Makefile.am | 6 +++--- ext/math/Makefile.am | 6 +++--- ext/tpx/Makefile.am | 4 ++-- 19 files changed, 43 insertions(+), 44 deletions(-) diff --git a/Cantera/src/base/Makefile.am b/Cantera/src/base/Makefile.am index 13edc9e05..4a1345d1a 100644 --- a/Cantera/src/base/Makefile.am +++ b/Cantera/src/base/Makefile.am @@ -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 diff --git a/Cantera/src/converters/Makefile.am b/Cantera/src/converters/Makefile.am index 951b8cc90..eb268cf28 100644 --- a/Cantera/src/converters/Makefile.am +++ b/Cantera/src/converters/Makefile.am @@ -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) diff --git a/Cantera/src/equil/Makefile.am b/Cantera/src/equil/Makefile.am index c0be25f05..6abe34773 100644 --- a/Cantera/src/equil/Makefile.am +++ b/Cantera/src/equil/Makefile.am @@ -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) diff --git a/Cantera/src/kinetics/Makefile.am b/Cantera/src/kinetics/Makefile.am index 429481b93..bd7e72bd3 100644 --- a/Cantera/src/kinetics/Makefile.am +++ b/Cantera/src/kinetics/Makefile.am @@ -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) diff --git a/Cantera/src/numerics/Makefile.am b/Cantera/src/numerics/Makefile.am index 7a061bc5f..f4132d8bc 100644 --- a/Cantera/src/numerics/Makefile.am +++ b/Cantera/src/numerics/Makefile.am @@ -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) diff --git a/Cantera/src/oneD/Makefile.am b/Cantera/src/oneD/Makefile.am index 08a044274..28e2a5247 100644 --- a/Cantera/src/oneD/Makefile.am +++ b/Cantera/src/oneD/Makefile.am @@ -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) diff --git a/Cantera/src/spectra/Makefile.am b/Cantera/src/spectra/Makefile.am index e2e9eab5a..19b5168db 100644 --- a/Cantera/src/spectra/Makefile.am +++ b/Cantera/src/spectra/Makefile.am @@ -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) diff --git a/Cantera/src/thermo/Makefile.am b/Cantera/src/thermo/Makefile.am index 8916c0645..454f87ccd 100644 --- a/Cantera/src/thermo/Makefile.am +++ b/Cantera/src/thermo/Makefile.am @@ -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) diff --git a/Cantera/src/transport/Makefile.am b/Cantera/src/transport/Makefile.am index a5c490b65..1c1c774d9 100644 --- a/Cantera/src/transport/Makefile.am +++ b/Cantera/src/transport/Makefile.am @@ -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) diff --git a/Cantera/src/zeroD/Makefile.am b/Cantera/src/zeroD/Makefile.am index fb78cdc67..7ce28e3fb 100644 --- a/Cantera/src/zeroD/Makefile.am +++ b/Cantera/src/zeroD/Makefile.am @@ -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) diff --git a/Cantera/user/Makefile.am b/Cantera/user/Makefile.am index f65351db9..bd6545341 100644 --- a/Cantera/user/Makefile.am +++ b/Cantera/user/Makefile.am @@ -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 diff --git a/configure.ac b/configure.ac index 3ef2cd997..f27a29759 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/examples/cxx/Makefile.am b/examples/cxx/Makefile.am index 19abff458..840c967e7 100644 --- a/examples/cxx/Makefile.am +++ b/examples/cxx/Makefile.am @@ -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) diff --git a/ext/blas/Makefile.am b/ext/blas/Makefile.am index 3bdd18206..77ebce8b8 100644 --- a/ext/blas/Makefile.am +++ b/ext/blas/Makefile.am @@ -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 diff --git a/ext/cvode/Makefile.am b/ext/cvode/Makefile.am index ffad4d340..752831146 100644 --- a/ext/cvode/Makefile.am +++ b/ext/cvode/Makefile.am @@ -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 diff --git a/ext/f2c_libs/Makefile.am b/ext/f2c_libs/Makefile.am index 339fa54d4..d08f5329d 100644 --- a/ext/f2c_libs/Makefile.am +++ b/ext/f2c_libs/Makefile.am @@ -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 diff --git a/ext/lapack/Makefile.am b/ext/lapack/Makefile.am index df5399853..650ece62c 100644 --- a/ext/lapack/Makefile.am +++ b/ext/lapack/Makefile.am @@ -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 diff --git a/ext/math/Makefile.am b/ext/math/Makefile.am index 7a221434d..1139d010c 100644 --- a/ext/math/Makefile.am +++ b/ext/math/Makefile.am @@ -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 diff --git a/ext/tpx/Makefile.am b/ext/tpx/Makefile.am index 728a02cb0..1988875ab 100644 --- a/ext/tpx/Makefile.am +++ b/ext/tpx/Makefile.am @@ -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