From 917a43ee2166e9cce374ffee28203826cb8cef58 Mon Sep 17 00:00:00 2001 From: Nicholas Malaya Date: Mon, 6 Feb 2012 22:06:00 +0000 Subject: [PATCH] [cantera]: now headers are only copied if they have been edited --- Cantera/src/Makefile.am | 3 +-- Cantera/src/base/Makefile.am | 4 ++-- Cantera/src/numerics/Makefile.am | 2 +- Cantera/src/thermo/Makefile.am | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Cantera/src/Makefile.am b/Cantera/src/Makefile.am index bac33dc0e..836d04dc6 100644 --- a/Cantera/src/Makefile.am +++ b/Cantera/src/Makefile.am @@ -1,7 +1,6 @@ # $Id: $ -# need to add CXX_INCLUDES # will need to add python and matlab -SUBDIRS = base converters thermo transport oneD zeroD kinetics numerics spectra equil +SUBDIRS = numerics base converters thermo transport oneD zeroD kinetics spectra equil diff --git a/Cantera/src/base/Makefile.am b/Cantera/src/base/Makefile.am index 086783d52..688dc57bd 100644 --- a/Cantera/src/base/Makefile.am +++ b/Cantera/src/base/Makefile.am @@ -27,9 +27,9 @@ __top_builddir__build_lib_libctbase_la_LDFLAGS = $(all_libraries) -release __top_builddir__build_lib_libctbase_la_SOURCES = $(cc_sources) $(h_sources) -# header file accumulation +# header file accumulation -- only copy if file updated! all: @echo copying headers $< - cp *.h $(top_builddir)/build/include/ + cp -u *.h $(top_builddir)/build/include/ CLEANFILES = *.o diff --git a/Cantera/src/numerics/Makefile.am b/Cantera/src/numerics/Makefile.am index cef6366c2..590476bf4 100644 --- a/Cantera/src/numerics/Makefile.am +++ b/Cantera/src/numerics/Makefile.am @@ -7,7 +7,7 @@ cc_sources = DenseMatrix.cpp funcs.cpp Func1.cpp ODE_integrators.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_CPPFLAGS = -I$(top_builddir)/build/include/ -I$(top_builddir) AM_CXXFLAGS = $(AM_CPPFLAGS) lib_LTLIBRARIES = $(top_builddir)/build/lib/libctnumerics.la diff --git a/Cantera/src/thermo/Makefile.am b/Cantera/src/thermo/Makefile.am index d8fdb1c63..50dbcc7ad 100644 --- a/Cantera/src/thermo/Makefile.am +++ b/Cantera/src/thermo/Makefile.am @@ -12,7 +12,7 @@ h_sources = State.h Elements.h Constituents.h Phase.h mix_defs.h \ VPSSMgr.h VPSSMgrFactory.h VPSSMgr_General.h \ VPSSMgr_IdealGas.h VPSSMgr_ConstVol.h PDSS_ConstVol.h \ PDSS_IdealGas.h PDSS_SSVol.h DebyeHuckel.h \ - VPStandardStateTP.h PDSS_Water.h PDSS.h WaterProps.h \ + VPStandardStateTP.h PDSS_Water.h WaterProps.h \ WaterPropsIAPWSphi.h VPSSMgr_Water_HKFT.h PDSS_HKFT.h \ PDSS_IonsFromNeutral.h IonsFromNeutralVPSSTP.h \ GibbsExcessVPSSTP.h LatticePhase.h IdealMolalSoln.h \ @@ -59,4 +59,4 @@ __top_builddir__build_lib_libthermo_la_SOURCES = $(cc_sources) $(h_sources) # header file accumulation all: @echo copying headers $< - cp $(h_sources) $(top_builddir)/build/include/ + cp *.h $(top_builddir)/build/include/