* Don't destroy the entire [123]d.coeffs/ directory when we regenerate the

  coefficients, because that would confuse CVS.  Instead, just remove any
  old coefficients.
* provide separate makefile targets to create empty directories for
  coefficients; these are only needed for adding a new interpolator order
  or suchlike


git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/LocalInterp/trunk@37 df1f8a13-aa1d-4dd4-9681-27ded5b42416

1 files changed, 50 insertions, 25 deletions

diff --git a/src/GeneralizedPolynomial-Uniform/makefile b/src/GeneralizedPolynomial-Uniform/makefile
index 2f0a7a8..213ad00 100644
--- a/src/GeneralizedPolynomial-Uniform/makefile
+++ b/src/GeneralizedPolynomial-Uniform/makefile
@@ -3,8 +3,54 @@ no-default-target:
 	@echo 'there is (deliberately) no default target in this makefile!'
 	@echo 'see the makefile to find out about targets you can specify explicitly'
 
+#
+# main targets: rebuild machine-generated coefficient files
+#
+
 .PHONY	: 1d
 1d	:
+	-rm 1d.coeffs/*/*.c
+	cat util.maple interpolate.maple 1d.maple \
+           | maple 2>&1 >1d.log
+
+.PHONY	: 2d
+2d	:
+	-rm 2d.coeffs/*/*.c
+	cat util.maple interpolate.maple 2d.maple \
+           | maple 2>&1 >2d.log
+
+.PHONY	: 3d
+3d	:
+	-rm 3d.coeffs/*/*.c
+	cat util.maple interpolate.maple 3d.maple \
+           | maple 2>&1 >3d.log
+
+################################################################################
+
+#
+# standalone test programs
+#
+
+test_molecule_posn	: test_molecule_posn.c molecule_posn.c \
+                          InterpLocalUniform.h
+	gcc -g \
+            -Wall -W -Wno-unused -Wshadow -Winline -Wpointer-arith \
+            -Wbad-function-cast -Wcast-align -Wcast-qual \
+            -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations \
+            -DLOCALINTERP_STANDALONE_BUILD -o test_molecule_posn \
+            test_molecule_posn.c molecule_posn.c -lm
+
+################################################################################
+
+#
+# targets to initially create directories for machine-generated coefficients
+# these only need to be run if you're setting up a new interpolator,
+# i.e. if you don't already have the directories in cvs
+# (you still have to add them to cvs by hand)
+#
+
+.PHONY	: 1d.coeffs
+1d.coeffs:
 	-rm -rf 1d.coeffs
 	mkdir 1d.coeffs
 	cd 1d.coeffs && mkdir 1d.cube.size2
@@ -19,11 +65,9 @@ no-default-target:
 	cd 1d.coeffs && mkdir 1d.cube.order4.smooth0
 	cd 1d.coeffs && mkdir 1d.cube.order5.smooth0
 	cd 1d.coeffs && mkdir 1d.cube.order6.smooth0
-	cat util.maple interpolate.maple 1d.maple \
-           | maple 2>&1 >1d.log
 
-.PHONY	: 2d
-2d	:
+.PHONY	: 2d.coeffs
+2d.coeffs:
 	-rm -rf 2d.coeffs
 	mkdir 2d.coeffs
 	cd 2d.coeffs && mkdir 2d.cube.size2
@@ -34,11 +78,9 @@ no-default-target:
 	cd 2d.coeffs && mkdir 2d.cube.order2.smooth0
 	cd 2d.coeffs && mkdir 2d.cube.order3.smooth0
 	cd 2d.coeffs && mkdir 2d.cube.order4.smooth0
-	cat util.maple interpolate.maple 2d.maple \
-           | maple 2>&1 >2d.log
 
-.PHONY	: 3d
-3d	:
+.PHONY	: 3d.coeffs
+3d.coeffs:
 	-rm -rf 3d.coeffs
 	mkdir 3d.coeffs
 	cd 3d.coeffs && mkdir 3d.cube.size2
@@ -49,20 +91,3 @@ no-default-target:
 	cd 3d.coeffs && mkdir 3d.cube.order2.smooth0
 	cd 3d.coeffs && mkdir 3d.cube.order3.smooth0
 	cd 3d.coeffs && mkdir 3d.cube.order4.smooth0
-	cat util.maple interpolate.maple 3d.maple \
-           | maple 2>&1 >3d.log
-
-########################################
-
-#
-# standalone test programs
-#
-
-test_molecule_posn	: test_molecule_posn.c molecule_posn.c \
-                          InterpLocalUniform.h
-	gcc -g \
-            -Wall -W -Wno-unused -Wshadow -Winline -Wpointer-arith \
-            -Wbad-function-cast -Wcast-align -Wcast-qual \
-            -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations \
-            -DLOCALINTERP_STANDALONE_BUILD -o test_molecule_posn \
-            test_molecule_posn.c molecule_posn.c -lm