4 files changed, 17 insertions, 15 deletions
diff --git a/src/include/Makefile b/src/include/Makefile
deleted file mode 100644
index 6c5f2e8..0000000
--- a/src/include/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Makefile to make symlinks to header files in other directories
-# $Id: Makefile,v 1.1 2001-06-15 11:00:34 jthorn Exp $
-
-.PHONY	: default
-default	:
-	test -e util++.hh || ln -s ../libutil/util++.hh .
-
-.PHONY	: clean
-clean	:
-	-rm util++.hh
diff --git a/src/include/README b/src/include/README
index a616529..8858d92 100644
--- a/src/include/README
+++ b/src/include/README
@@ -1,5 +1,9 @@
 This directory holds header files common to all of this thorn.
 
+fake_cctk.h
+	is a fake version of "cctk.h" for non-Cactus standalone test
+	compilations, containing typedefs for CCTK_INT, CCTK_REAL, etc
+
 stdc.h
 	is a low-level file defining Jonathan Thornburg's "dialect" of C,
 	including the "then" pseudo-keyword you'll see all through the
diff --git a/src/include/config.hh b/src/include/config.hh
index d1bc9f2..dcbf2c9 100644
--- a/src/include/config.hh
+++ b/src/include/config.hh
@@ -1,13 +1,16 @@
 // config.hh -- compile-time configuration for AHFinderDirect
 // $Id$
 
-#ifndef CCTK_VARIABLE_REAL
-   // we must be doing a test compilation outside of Cactus
-   typedef double CCTK_REAL;
-   typedef int    CCTK_INT;
-#endif
+//
+// prerequisites:
+//	"cctk.h" or "fake_cctk.h"
+//
+
 typedef CCTK_REAL fp;
 
+// FIXME: this assumes fp == C 'double'
+#define FP_SCANF_FORMAT "%lf"
+
 //
 // The angular finite differencing in our multipatch system can be
 // either 2nd order or 4th order, configurable here.
diff --git a/src/include/fake_cctk.h b/src/include/fake_cctk.h
new file mode 100644
index 0000000..3e62201
--- /dev/null
+++ b/src/include/fake_cctk.h
@@ -0,0 +1,5 @@
+/* fake_cctk.h -- fake "cctk.h" for non-Cactus standalone compilations */
+/* $Id$ */
+
+typedef int    CCTK_INT;
+typedef double CCTK_REAL;