Now the presence of old parameter header files won't confuse the system.

Note that the dependencies may not pick up that things now depend on a
different set of files, so it may still be necessery to do a gmake ..-clean
to force files to be rebuilt - e.g. changing all parameters from private
to protected won't be picked up by the current dependency checking
mechanism.

Tom


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

1 files changed, 16 insertions, 15 deletions

diff --git a/lib/sbin/CST b/lib/sbin/CST
index 8a2d4f97..7f374792 100644
--- a/lib/sbin/CST
+++ b/lib/sbin/CST
@@ -384,6 +384,7 @@ sub CreateParameterBindings
   local($files);
   local(%routines);
   local($structure, %structures);
+  local(%header_files);
 
   %parameter_database = @rest[0..(2*$n_param_database)-1];
   %interface_database = @rest[2*$n_param_database..$#rest];
@@ -442,6 +443,8 @@ sub CreateParameterBindings
 
   close OUT;
 
+  $header_files{"PUBLIC"} = "ParameterCPublic.h";
+
   chdir "..";
   chdir "Parameters";
 
@@ -487,6 +490,8 @@ sub CreateParameterBindings
 
       close OUT;
 
+      $header_files{"\U$implementation\E PROTECTED"} = "ParameterCProtected\U$implementation\E".".h";
+
       chdir "..";
       chdir "Parameters";
 
@@ -532,6 +537,8 @@ sub CreateParameterBindings
 
       close OUT;
 
+      $header_files{"\U$thorn\E PRIVATE"} = "ParameterCPrivate\U$thorn\E".".h";
+
       chdir "..";
       chdir "Parameters";
 
@@ -746,22 +753,19 @@ EOT
 
 EOT
 
-  $header =  "ParameterCPublic.h";
-  if( -r $header)
+  if($header_files{"PUBLIC"})
   {
-    print OUT "#include \"$header\"\n";
+    print OUT "#include \"". $header_files{"PUBLIC"} ."\"\n";
   }
  
-  $header =  "ParameterCProtected\U$implementation\E.h";
-  if( -r $header)
+  if($header_files{"\U$implementation\E PROTECTED"})
   {
-    print OUT "#include \"$header\"\n";
+    print OUT "#include \"". $header_files{"\U$implementation\E PROTECTED"}."\"\n";
   }
 
-  $header =  "ParameterCPrivate\U$thorn\E.h";
-  if( -r $header)
+  if($header_files{"\U$thorn\E PRIVATE"})
   {
-    print OUT "#include \"$header\"\n";
+    print OUT "#include \"".$header_files{"\U$thorn\E PRIVATE"}."\"\n";
   }
  
   print OUT "\n";
@@ -792,23 +796,20 @@ EOT
 
     print OUT "#define DECLARE_PARAMETERS \\\n";
 
-    $header =  "ParameterCPublic.h";
     $decl =  "DECLARE_PUBLIC_PARAMETER_STRUCT_PARAMS";
-    if( -r $header)
+    if($header_files{"PUBLIC"})
     {
       print OUT "$decl \\\n";
     }
  
-    $header =  "ParameterCProtected\U$implementation\E.h";
     $decl = "DECLARE_PROTECTED_\U$implementation\E_STRUCT_PARAMS";
-    if( -r $header)
+    if($header_files{"\U$implementation\E PROTECTED"})
     {
       print OUT "$decl \\\n";
     }
 
-    $header =  "ParameterCPrivate\U$thorn\E.h";
     $decl = "DECLARE_PRIVATE_\U$thorn\E_STRUCT_PARAMS";
-    if( -r $header)
+    if($header_files{"\U$thorn\E PRIVATE"})
     {
       print OUT "$decl \\\n";
     }