Ok, think I fixed it. Added a demo results and added Makefile back into
repository so that demo problems run correctly in both directories (and give the same result).
This commit is contained in:
parent
816e3ce753
commit
7fbef7cc0c
3 changed files with 45 additions and 1 deletions
|
|
@ -14,7 +14,8 @@ build_python=@BUILD_PYTHON@
|
|||
build_particles=@BUILD_PARTICLES@
|
||||
|
||||
all:
|
||||
cd src; @MAKE@
|
||||
@INSTALL@ include/*.h ../../build/include/cantera
|
||||
cd src; @MAKE@
|
||||
cd demos; @MAKE@
|
||||
|
||||
clean:
|
||||
|
|
|
|||
|
|
@ -63,6 +63,18 @@ $(PROGRAM): $(OBJS) $(CANTERA_LIBDIR)/libcantera.a
|
|||
test:
|
||||
@MAKE@ $(PROGRAM)
|
||||
./runtest
|
||||
|
||||
install:
|
||||
@INSTALL@ -d @ct_demodir@/cxx
|
||||
@INSTALL@ *.cpp @ct_demodir@/cxx
|
||||
@INSTALL@ *.h @ct_demodir@/cxx
|
||||
@INSTALL@ kin1_blessed.csv @ct_demodir@/cxx
|
||||
@INSTALL@ kin1_blessed.dat @ct_demodir@/cxx
|
||||
@INSTALL@ Makefile.install @ct_demodir@/cxx/Makefile
|
||||
chown -R @username@ @ct_demodir@/cxx
|
||||
|
||||
|
||||
clean:
|
||||
$(RM) $(OBJS) $(PROGRAM)
|
||||
../../../bin/rm_cvsignore
|
||||
|
||||
|
|
|
|||
31
Cantera/cxx/demos/Makefile.install
Normal file
31
Cantera/cxx/demos/Makefile.install
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
# This Makefile uses script 'ctnew' to create the Makefiles for each
|
||||
# demo program. This script is created during the Cantera build
|
||||
# process, and is installed by default in /usr/local/bin.
|
||||
|
||||
# if script ctnew is not on the PATH, set this to the path to it.
|
||||
CTNEW = ctnew
|
||||
|
||||
SRCS = kinetics1.cpp kinetics2.cpp flame1.cpp
|
||||
|
||||
OBJS = $(SRCS:.cpp=.o)
|
||||
EXES = $(SRCS:.cpp=.x)
|
||||
MKS = $(SRCS:.cpp=.mak)
|
||||
|
||||
all: $(EXES)
|
||||
|
||||
%.mak:
|
||||
$(CTNEW); sed 's/demo/$*/g' demo.mak > $*.mak
|
||||
|
||||
%.x:
|
||||
@echo
|
||||
@echo Building program $*.x...
|
||||
@echo
|
||||
make $*.mak; make -f $*.mak; mv $* $*.x
|
||||
@echo
|
||||
@echo type '$*.x' to run the program
|
||||
@echo
|
||||
|
||||
clean:
|
||||
rm -f $(OBJS) $(EXES) $(MKS)
|
||||
|
||||
|
||||
Loading…
Add table
Reference in a new issue