Changing include file names

git-svn-id: http://svn.cactuscode.org/flesh/trunk@1264 17b73243-c579-4c4c-a9d2-2d5706c11dac

4 files changed, 19 insertions, 19 deletions

diff --git a/lib/make/configure b/lib/make/configure
index 359d8a74..8c76e7cd 100755
--- a/lib/make/configure
+++ b/lib/make/configure
@@ -1373,7 +1373,7 @@ fi
 
 # Create a file to put any #defines etc needed for this architecture
 # known architecture stuff should use cat >> etc to append to this file.
-cat > cctk_archdefs.h <<EOF
+cat > cctk_Archdefs.h <<EOF
 /* Stuff from known architectures */
 #ifndef _CCTK_ARCHDEFS_H_
 #define _CCTK_ARCHDEFS_H_
@@ -1386,7 +1386,7 @@ if test -r $srcdir/known-architectures/$host_os ; then
 fi
 
 # Finish the architecture stuff
-cat >> cctk_archdefs.h <<EOF
+cat >> cctk_Archdefs.h <<EOF
 #endif /* _CCTK_ARCHDEFS_H_ */
 EOF
 
@@ -1394,7 +1394,7 @@ EOF
 #########################################################################
 #Check for extra stuff
 #########################################################################
-cat > cctk_extradefs.h <<EOF
+cat > cctk_Extradefs.h <<EOF
 /* Stuff from extra packages */
 #ifndef _CCTK_EXTRADEFS_H_
 #define _CCTK_EXTRADEFS_H_
@@ -1409,8 +1409,8 @@ do
   if test -d $srcdir/extras/$extra ; then
     if test -x $srcdir/extras/$extra/setup.sh ; then
         # Put some comment lines in the files.
-        CCTK_WriteLine cctk_extradefs.h ""
-        CCTK_WriteLine cctk_extradefs.h "/*$extra definitions*/"
+        CCTK_WriteLine cctk_Extradefs.h ""
+        CCTK_WriteLine cctk_Extradefs.h "/*$extra definitions*/"
         CCTK_WriteLine make.extra.defn ""
         CCTK_WriteLine make.extra.defn "# $extra definitions"
         # Call the setup script
@@ -1423,7 +1423,7 @@ do
 done
 
 # Finish the cctk_extradefs.h file
-cat >> cctk_extradefs.h <<EOF
+cat >> cctk_Extradefs.h <<EOF
 #endif /*_CCTK_EXTRADEFS_H_*/
 EOF
 
@@ -2940,7 +2940,7 @@ done
 
 ac_given_srcdir=$srcdir
 
-trap 'rm -fr `echo "make.config.defn make.config.deps make.config.rules cctk_config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "make.config.defn make.config.deps make.config.rules cctk_Config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -3147,7 +3147,7 @@ ac_eD='%g'
 if test "${CONFIG_HEADERS+set}" != set; then
 EOF
 cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="cctk_config.h"
+  CONFIG_HEADERS="cctk_Config.h"
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 fi
diff --git a/lib/make/configure.in b/lib/make/configure.in
index 5b1f183b..4506112e 100644
--- a/lib/make/configure.in
+++ b/lib/make/configure.in
@@ -17,7 +17,7 @@ AC_PREREQ(2.13)
 
 dnl Starts here
 AC_INIT()
-AC_CONFIG_HEADER(cctk_config.h)
+AC_CONFIG_HEADER(cctk_Config.h)
 
 dnl Check the system type
 AC_CANONICAL_SYSTEM
@@ -92,7 +92,7 @@ fi
 
 # Create a file to put any #defines etc needed for this architecture
 # known architecture stuff should use cat >> etc to append to this file.
-cat > cctk_archdefs.h <<EOF
+cat > cctk_Archdefs.h <<EOF
 /* Stuff from known architectures */
 #ifndef _CCTK_ARCHDEFS_H_
 #define _CCTK_ARCHDEFS_H_
@@ -105,7 +105,7 @@ if test -r $srcdir/known-architectures/$host_os ; then
 fi
 
 # Finish the architecture stuff
-cat >> cctk_archdefs.h <<EOF
+cat >> cctk_Archdefs.h <<EOF
 #endif /* _CCTK_ARCHDEFS_H_ */
 EOF
 
@@ -113,7 +113,7 @@ EOF
 #########################################################################
 #Check for extra stuff
 #########################################################################
-cat > cctk_extradefs.h <<EOF
+cat > cctk_Extradefs.h <<EOF
 /* Stuff from extra packages */
 #ifndef _CCTK_EXTRADEFS_H_
 #define _CCTK_EXTRADEFS_H_
@@ -128,8 +128,8 @@ do
   if test -d $srcdir/extras/$extra ; then
     if test -x $srcdir/extras/$extra/setup.sh ; then
         # Put some comment lines in the files.
-        CCTK_WriteLine cctk_extradefs.h ""
-        CCTK_WriteLine cctk_extradefs.h "/*$extra definitions*/"
+        CCTK_WriteLine cctk_Extradefs.h ""
+        CCTK_WriteLine cctk_Extradefs.h "/*$extra definitions*/"
         CCTK_WriteLine make.extra.defn ""
         CCTK_WriteLine make.extra.defn "# $extra definitions"
         # Call the setup script
@@ -142,7 +142,7 @@ do
 done
 
 # Finish the cctk_extradefs.h file
-cat >> cctk_extradefs.h <<EOF
+cat >> cctk_Extradefs.h <<EOF
 #endif /*_CCTK_EXTRADEFS_H_*/
 EOF
 
diff --git a/lib/sbin/CreateParameterBindings.pl b/lib/sbin/CreateParameterBindings.pl
index b62261c4..bca9ff87 100644
--- a/lib/sbin/CreateParameterBindings.pl
+++ b/lib/sbin/CreateParameterBindings.pl
@@ -196,7 +196,7 @@ sub CreateParameterBindings
   $dataout .= "\#include <stdio.h>\n";
   $dataout .= "\#include <stdlib.h>\n";
   $dataout .= "\#include <string.h>\n";
-  $dataout .= "\#include \"cctk_config.h\"\n";
+  $dataout .= "\#include \"cctk_Config.h\"\n";
   $dataout .= "\#include \"cctk_Misc.h\"\n";
   $dataout .= "\#include \"cctk_WarnLevel.h\"\n";
 
@@ -300,7 +300,7 @@ sub CreateParameterBindings
     $dataout .= "#define DECLARE_CCTK_PARAMETERS \\\n";
 
     $dataout .= "void      *cctk_pdummy_pointer;\\
-                 int        cctk_pdummy_int;\\
+                 CCTK_INT   cctk_pdummy_int;\\
                  CCTK_REAL  cctk_pdummy_real;\\\n";
 
 
@@ -478,7 +478,7 @@ sub NewParamStuff
 
     push(@data, "#include <stdarg.h>");
     push(@data, "");
-    push(@data, "#include \"cctk_config.h\"");
+    push(@data, "#include \"cctk_Config.h\"");
     push(@data, "#include \"ParameterBindings.h\"");
 
     push(@data, "#include \"CParameterStructNames.h\"");
diff --git a/lib/sbin/CreateScheduleBindings.pl b/lib/sbin/CreateScheduleBindings.pl
index 7c4980d9..7ff01e2d 100644
--- a/lib/sbin/CreateScheduleBindings.pl
+++ b/lib/sbin/CreateScheduleBindings.pl
@@ -139,7 +139,7 @@ sub ScheduleCreateFile
   $outbuf .=  "\n";
   $outbuf .=  "\#include \"cctk.h\"\n";
   $outbuf .=  "\#include \"cctk_parameters.h\"\n";
-  $outbuf .=  "\#include \"cctk_schedule.h\"\n";
+  $outbuf .=  "\#include \"cctk_Schedule.h\"\n";
   $outbuf .=  "\n";
   $outbuf .=  "/* Prototypes for functions to be registered. */\n";
   $outbuf .=  "$prototypes\n";