From 219d9b62934d7b9c6ab48c7ec42d3dfe76336557 Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Tue, 24 Mar 2009 21:45:50 +0000 Subject: [PATCH] Adding more install rules. --- Cantera/python/examples/flames/Makefile.in | 11 +++++++++++ .../examples/flames/adiabatic_flame/Makefile.in | 13 +++++++++++++ .../python/examples/flames/flame1/Makefile.in | 16 ++++++++++++++++ .../python/examples/flames/flame2/Makefile.in | 13 +++++++++++++ .../examples/flames/flame_fixed_T/Makefile.in | 14 ++++++++++++++ .../examples/flames/free_h2_air/Makefile.in | 14 +++++++++++++- .../python/examples/flames/npflame1/Makefile.in | 13 ++++++++++++- .../python/examples/flames/stflame1/Makefile.in | 13 ++++++++++++- Cantera/python/examples/fuel_cells/Makefile.in | 13 +++++++++++++ Cantera/python/examples/kinetics/Makefile.in | 5 ++--- Cantera/python/examples/transport/Makefile.in | 14 ++++++++++++++ 11 files changed, 133 insertions(+), 6 deletions(-) diff --git a/Cantera/python/examples/flames/Makefile.in b/Cantera/python/examples/flames/Makefile.in index 93c940988..c16ff0821 100644 --- a/Cantera/python/examples/flames/Makefile.in +++ b/Cantera/python/examples/flames/Makefile.in @@ -1,5 +1,7 @@ #!/bin/sh +INST_DIR=@ct_demodir@/python/flames + PY_DEMOS = flame1 flame2 stflame1 npflame1 free_h2_air \ adiabatic_flame flame_fixed_T PYTHON_CMD = @PYTHON_CMD@ @@ -22,6 +24,15 @@ test: (cd $${py} ; @MAKE@ test ) \ done) +install: + @INSTALL@ -d $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r Makefile $(INST_DIR) + @(for py in $(PY_DEMOS) ; do \ + echo "running $${py}..."; \ + (cd $${py} ; @MAKE@ install ) \ + done) + + clean: @(for py in $(PY_DEMOS) ; do \ echo "running $${py}..."; \ diff --git a/Cantera/python/examples/flames/adiabatic_flame/Makefile.in b/Cantera/python/examples/flames/adiabatic_flame/Makefile.in index 766cbb42a..c0b689433 100644 --- a/Cantera/python/examples/flames/adiabatic_flame/Makefile.in +++ b/Cantera/python/examples/flames/adiabatic_flame/Makefile.in @@ -1,5 +1,7 @@ #!/bin/sh +INST_DIR=@ct_demodir@/python/flames/adiabatic_flame + PYTHON_CMD = @PYTHON_CMD@ run: @@ -7,6 +9,17 @@ run: test: ./runtest + +install: + @INSTALL@ -d $(INST_DIR) + @@INSTALL@ -c -m ug+rw,o+r Makefile $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r adiabatic_flame.py $(INST_DIR) + @INSTALL@ -c runtest $(INST_DIR) + @INSTALL@ -c cleanup $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r output_blessed_0.txt $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r adiabatic_flame_blessed_0.csv $(INST_DIR) + + clean: rm -f *.log *.csv *.xml ./cleanup diff --git a/Cantera/python/examples/flames/flame1/Makefile.in b/Cantera/python/examples/flames/flame1/Makefile.in index 995a87b24..f33110f2d 100644 --- a/Cantera/python/examples/flames/flame1/Makefile.in +++ b/Cantera/python/examples/flames/flame1/Makefile.in @@ -1,5 +1,8 @@ #!/bin/sh +INST_DIR=@ct_demodir@/python/flames/flame1 + + PYTHON_CMD = @PYTHON_CMD@ run: @@ -7,6 +10,19 @@ run: test: ./runtest + +install: + @INSTALL@ -d $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r Makefile $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r flame1.py $(INST_DIR) + @INSTALL@ -c runtest $(INST_DIR) + @INSTALL@ -c cleanup $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r output_blessed_0.txt $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r flame1_blessed_0.csv $(INST_DIR) + + + + clean: rm -f *.log *.csv *.xml ./cleanup diff --git a/Cantera/python/examples/flames/flame2/Makefile.in b/Cantera/python/examples/flames/flame2/Makefile.in index fb17c7563..e87eb3788 100644 --- a/Cantera/python/examples/flames/flame2/Makefile.in +++ b/Cantera/python/examples/flames/flame2/Makefile.in @@ -1,5 +1,7 @@ #!/bin/sh +INST_DIR=@ct_demodir@/python/flames/flame2 + PYTHON_CMD = @PYTHON_CMD@ run: @@ -7,6 +9,17 @@ run: test: ./runtest + +install: + @INSTALL@ -d $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r Makefile $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r flame2.py $(INST_DIR) + @INSTALL@ -c runtest $(INST_DIR) + @INSTALL@ -c cleanup $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r output_blessed_0.txt $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r flame2_blessed_0.csv $(INST_DIR) + + clean: rm -f *.log *.csv *.xml ./cleanup diff --git a/Cantera/python/examples/flames/flame_fixed_T/Makefile.in b/Cantera/python/examples/flames/flame_fixed_T/Makefile.in index 97e3a771b..087f8c64d 100644 --- a/Cantera/python/examples/flames/flame_fixed_T/Makefile.in +++ b/Cantera/python/examples/flames/flame_fixed_T/Makefile.in @@ -1,5 +1,8 @@ #!/bin/sh +INST_DIR=@ct_demodir@/python/flames/flame_fixed_T + + PYTHON_CMD = @PYTHON_CMD@ run: @@ -7,6 +10,17 @@ run: test: ./runtest + +install: + @INSTALL@ -d $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r Makefile $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r flame_fixed_T.py $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r tdata.dat $(INST_DIR) + @INSTALL@ -c runtest $(INST_DIR) + @INSTALL@ -c cleanup $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r output_blessed_0.txt $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r flame_fixed_T_blessed_0.csv $(INST_DIR) + clean: rm -f *.log *.csv *.xml ./cleanup diff --git a/Cantera/python/examples/flames/free_h2_air/Makefile.in b/Cantera/python/examples/flames/free_h2_air/Makefile.in index 250329bbd..e76d1b671 100644 --- a/Cantera/python/examples/flames/free_h2_air/Makefile.in +++ b/Cantera/python/examples/flames/free_h2_air/Makefile.in @@ -1,5 +1,7 @@ #!/bin/sh +INST_DIR=@ct_demodir@/python/flames/free_h2_air + PYTHON_CMD = @PYTHON_CMD@ run: @@ -7,8 +9,18 @@ run: test: ./runtest + +install: + @INSTALL@ -d $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r Makefile $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r free_h2_air.py $(INST_DIR) + @INSTALL@ -c runtest $(INST_DIR) + @INSTALL@ -c cleanup $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r output_blessed_0.txt $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r freeflame1_blessed_0.csv $(INST_DIR) + clean: - rm -f *.log *.csv *.xml + rm -f *.log output_0.txt freeflame1.csv freeflame1.xml ./cleanup # end of file diff --git a/Cantera/python/examples/flames/npflame1/Makefile.in b/Cantera/python/examples/flames/npflame1/Makefile.in index 78400cad8..555b7546c 100644 --- a/Cantera/python/examples/flames/npflame1/Makefile.in +++ b/Cantera/python/examples/flames/npflame1/Makefile.in @@ -1,5 +1,7 @@ #!/bin/sh +INST_DIR=@ct_demodir@/python/flames/npflame1 + PYTHON_CMD = @PYTHON_CMD@ run: @@ -7,8 +9,17 @@ run: test: ./runtest + +install: + @INSTALL@ -d $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r Makefile $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r npflame1.py $(INST_DIR) + @INSTALL@ -c runtest $(INST_DIR) + @INSTALL@ -c cleanup $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r output_blessed_0.txt $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r npflame1_blessed_0.csv $(INST_DIR) + clean: - rm -f *.log *.csv *.xml ./cleanup # end of file diff --git a/Cantera/python/examples/flames/stflame1/Makefile.in b/Cantera/python/examples/flames/stflame1/Makefile.in index 4a4e84482..245033e39 100644 --- a/Cantera/python/examples/flames/stflame1/Makefile.in +++ b/Cantera/python/examples/flames/stflame1/Makefile.in @@ -1,5 +1,7 @@ #!/bin/sh +INST_DIR=@ct_demodir@/python/flames/stflame1 + PYTHON_CMD = @PYTHON_CMD@ run: @@ -7,8 +9,17 @@ run: test: ./runtest + +install: + @INSTALL@ -d $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r Makefile $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r stflame1.py $(INST_DIR) + @INSTALL@ -c runtest $(INST_DIR) + @INSTALL@ -c cleanup $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r output_blessed_0.txt $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r stflame1_1_blessed_0.csv $(INST_DIR) + clean: - rm -f *.log *.csv *.xml ./cleanup # end of file diff --git a/Cantera/python/examples/fuel_cells/Makefile.in b/Cantera/python/examples/fuel_cells/Makefile.in index 09e11854d..7ae954050 100644 --- a/Cantera/python/examples/fuel_cells/Makefile.in +++ b/Cantera/python/examples/fuel_cells/Makefile.in @@ -1,5 +1,7 @@ #!/bin/sh +INST_DIR=@ct_demodir@/python/fuel_cells + PYTHON_CMD = @PYTHON_CMD@ run: @@ -7,6 +9,17 @@ run: test: ./runtest + +install: + @INSTALL@ -d $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r Makefile $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r sofc.py $(INST_DIR) + @INSTALL@ -c runtest $(INST_DIR) + @INSTALL@ -c cleanup $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r output_blessed_0.txt $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r sofc_blessed_0.csv $(INST_DIR) + + clean: rm -f *.log *.csv *.xml ./cleanup diff --git a/Cantera/python/examples/kinetics/Makefile.in b/Cantera/python/examples/kinetics/Makefile.in index 7ae954050..799420043 100644 --- a/Cantera/python/examples/kinetics/Makefile.in +++ b/Cantera/python/examples/kinetics/Makefile.in @@ -1,6 +1,6 @@ #!/bin/sh -INST_DIR=@ct_demodir@/python/fuel_cells +INST_DIR=@ct_demodir@/python/kinetics PYTHON_CMD = @PYTHON_CMD@ @@ -13,11 +13,10 @@ test: install: @INSTALL@ -d $(INST_DIR) @INSTALL@ -c -m ug+rw,o+r Makefile $(INST_DIR) - @INSTALL@ -c -m ug+rw,o+r sofc.py $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r ratecoeffs.py $(INST_DIR) @INSTALL@ -c runtest $(INST_DIR) @INSTALL@ -c cleanup $(INST_DIR) @INSTALL@ -c -m ug+rw,o+r output_blessed_0.txt $(INST_DIR) - @INSTALL@ -c -m ug+rw,o+r sofc_blessed_0.csv $(INST_DIR) clean: diff --git a/Cantera/python/examples/transport/Makefile.in b/Cantera/python/examples/transport/Makefile.in index ccbb43e79..f938bfa22 100644 --- a/Cantera/python/examples/transport/Makefile.in +++ b/Cantera/python/examples/transport/Makefile.in @@ -1,5 +1,8 @@ #!/bin/sh +INST_DIR=@ct_demodir@/python/transport + + PYTHON_CMD = @PYTHON_CMD@ all @@ -10,6 +13,17 @@ run: test: ./runtest + +install: + @INSTALL@ -d $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r Makefile $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r dustgas.py $(INST_DIR) + @INSTALL@ -c runtest $(INST_DIR) + @INSTALL@ -c cleanup $(INST_DIR) + @INSTALL@ -c -m ug+rw,o+r output_blessed_0.txt $(INST_DIR) + + + clean: ./cleanup