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

Added a make hdr-collect line.

Browse source 
This is needed because the .h files in the build directory should be
kept up to date with the .a files in the build directory. Thus,
you need to update. Obviously, a more refined approach could
be envisioned where only out of date .h files are copied.
This commit is contained in:
Harry Moffat 2003-08-07 21:42:49 +00:00
parent 10ba4fede9
commit 26c5c4236f
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Cantera/src/Makefile.in
View file

@ -22,8 +22,8 @@ EXT = ../../ext
#----------------------
# basic components always needed
BASE = State.o Elements.o Constituents.o stringUtils.o misc.o importCTML.o ct2ctml.o plots.o \
xml.o Phase.o DenseMatrix.o ctml.o funcs.o ctvector.o phasereport.o
BASE = State.o Elements.o Constituents.o stringUtils.o misc.o importCTML.o plots.o \
xml.o Phase.o DenseMatrix.o ctml.o funcs.o ctvector.o phasereport.o ct2ctml.o
# thermodynamic properties
THERMO = $(BASE) ThermoPhase.o IdealGasPhase.o ConstDensityThermo.o SolidCompound.o SpeciesThermoFactory.o ThermoFactory.o
@ -50,7 +50,10 @@ SOLVERS = CVode.o BandMatrix.o
# 1D flow models
FLOW1D = $(KINETICS) $(SOLVERS)
EVERYTHING = $(KINETICS) $(HETEROKIN) $(CK) $(TRANSPORT) $(REACTOR) $(RPATH) $(SOLVERS) $(FLOW1D)
EVERYTHING = $(KINETICS) $(HETEROKIN) $(CK) $(TRANSPORT) $(REACTOR) $(RPATH) \
$(SOLVERS) $(FLOW1D)
all: @KERNEL@ lib
@ -83,8 +86,6 @@ tpx:
flow1D:
cd oneD; @MAKE@
CXX_LIBS = @LIBS@
CXX_INCLUDES = -I.
CANTERA_LIB = @buildlib@/libcantera.a
@ -109,10 +110,17 @@ misc.o: misc.cpp
# HKM note: The lib function below removes the library first.
# I was having trouble linking applications on linux
# without removing the cantera library first.
# suggest the following change:
#
# lib:
# @(if [ `ls -1t $(CANTERA_LIB) *.o | head -1` != $(CANTERA_LIB) ] ; then \
# $(RM) $(CANTERA_LIB) ; echo 'ar ruv ' $(CANTERA_LIB) '*.o' ; \
# ar ruv $(CANTERA_LIB) *.o ; fi)
#
lib:
$(RM) $(CANTERA_LIB)
@ARCHIVE@ $(CANTERA_LIB) *.o > /dev/null
cd ../.. ; @MAKE@ hdr-collect
clean:
$(RM) *.o *~ $(CANTERA_LIB)