From: Francis Russell <francis@unchartedbackwaters.co.uk>
Date: Wed, 20 Jun 2012 17:14:34 +0000 (+0100)
Subject: Mark generated UFL files as intermediates.
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=d1da3bf9151ecb5af8128a204f4e84026dbcfa32;p=francis%2Fexcafe_benchmarks.git

Mark generated UFL files as intermediates.
---

diff --git a/mass_matrix_2d/Makefile.in b/mass_matrix_2d/Makefile.in
index b81ccb1..8e1473a 100644
--- a/mass_matrix_2d/Makefile.in
+++ b/mass_matrix_2d/Makefile.in
@@ -34,3 +34,4 @@ clean:
 	rm -f *.py ${CLEAN_FILES}
 
 .PHONY: default tractable-benchmarks all-benchmarks clean
+.SECONDARY: ${INTERMEDIATES}
diff --git a/mass_matrix_2d/generate_ufl_rules.sh b/mass_matrix_2d/generate_ufl_rules.sh
index 0e589e4..a2bec18 100755
--- a/mass_matrix_2d/generate_ufl_rules.sh
+++ b/mass_matrix_2d/generate_ufl_rules.sh
@@ -2,6 +2,7 @@
 
 PROGRAMS=""
 CLEAN_FILES=""
+INTERMEDIATES=""
 
 for NF in 1 2 3 4; do
   for P in 1 2 3; do
@@ -17,6 +18,7 @@ for NF in 1 2 3 4; do
       # Generate UFL headers
       TEMPLATE_FILE="mass_matrix_f${NF}.tmpl"
       UFL_FILE="mass_matrix_${OPTIONS}.ufl"
+      INTERMEDIATES="${INTERMEDIATES} ${UFL_FILE}"
 
       TEMPLATE_GENERATED="${UFL_FILE} ${BENCHMARK_SOURCE}"
 
@@ -28,6 +30,7 @@ for NF in 1 2 3 4; do
         REP_SPECIFIC_OPTIONS="${OPTIONS}_${REPRESENTATION}"
         REP_SPECIFIC_UFL_FILE="mass_matrix_${REP_SPECIFIC_OPTIONS}.ufl"
         TEMPLATE_GENERATED="${TEMPLATE_GENERATED} ${REP_SPECIFIC_UFL_FILE}"
+        INTERMEDIATES="${INTERMEDIATES} ${REP_SPECIFIC_UFL_FILE}"
 
         # We need two copies, one for quadrature, one for tensor.
         echo "${REP_SPECIFIC_UFL_FILE}: ${UFL_FILE}"
@@ -52,7 +55,8 @@ for NF in 1 2 3 4; do
       echo "${BENCHMARK_EXECUTABLE}: ${BENCHMARK_SOURCE} ${FFC_BUILT_SOURCES} ${EXCAFE_BUILT_SOURCES}"
       echo '\t${CXX} ${CXXFLAGS} ${LDFLAGS} $< -o $@'
 
-      CLEAN_FILES="${BENCHMARK_EXECUTABLE} ${TEMPLATE_GENERATED} ${FFC_BUILT_SOURCES} ${CLEAN_FILES}"
+      CLEAN_FILES="${BENCHMARK_EXECUTABLE} ${TEMPLATE_GENERATED} ${CLEAN_FILES}"
+      CLEAN_FILES="${FFC_BUILT_SOURCES} ${EXCAFE_BUILT_SOURCES} ${CLEAN_FILES}"
 
       echo
     done
@@ -61,3 +65,4 @@ done
 
 echo "ALL_EXECUTABLES = ${PROGRAMS}"
 echo "CLEAN_FILES=${CLEAN_FILES}"
+echo "INTERMEDIATES=${INTERMEDIATES}"