summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac>2004-03-29 16:32:32 +0000
committertradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac>2004-03-29 16:32:32 +0000
commit94158358b63a923e7c260715ecdb03ea4025fd7f (patch)
tree40fc10449f316f26d350d1cc61c9ecc005234f96
parent365640de85286ec1c471ef9024b525d474fb4cfe (diff)
Removed compile-time dependency of all thorns on Cactus and CactusBindings.
Now that the F90 interface declarations were sourced out into AlphaThorns/F90 this isn't necessary anymore. git-svn-id: http://svn.cactuscode.org/flesh/trunk@3618 17b73243-c579-4c4c-a9d2-2d5706c11dac
-rw-r--r--lib/sbin/CST24
1 files changed, 15 insertions, 9 deletions
diff --git a/lib/sbin/CST b/lib/sbin/CST
index f8274f57..e9cdc383 100644
--- a/lib/sbin/CST
+++ b/lib/sbin/CST
@@ -6,7 +6,7 @@
# @desc
# Parses the the configuration files for thorns.
# @enddesc
-# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/sbin/CST,v 1.64 2004-03-27 19:35:48 goodale Exp $
+# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/sbin/CST,v 1.65 2004-03-29 16:32:32 tradke Exp $
#@@*/
# Global parameter to track the number of errors from the CST
@@ -364,7 +364,7 @@ sub CreateThornLinkList
}
# remove duplicate entries from the list, only keeping the rightmost
- for ($i = 0; $i <= $#liblist; $i++)
+ for ($i = 0; $i <= $#liblist; $i++)
{
for ($j = 0; $j < $i; $j++)
{
@@ -382,7 +382,7 @@ sub CreateThornLinkList
#/*@@
# @routine CreateThornDependencyList
-# @date Fri 36 Dec 2004
+# @date Fri 26 Dec 2004
# @author Erik Schnetter
# @desc
# Create the list of the thorns' make dependencies
@@ -391,7 +391,7 @@ sub CreateThornLinkList
sub CreateThornDependencyList
{
my (@varlist, @deplist);
-
+
# Find list of all thorns
foreach my $thorn (sort keys %thorns) {
next if ($configuration_database->{"\U$thorn OPTIONS\E"} eq 'NO_SOURCE'
@@ -399,9 +399,15 @@ sub CreateThornDependencyList
# Add the thorn and the thorn's requirements
# (The thorn name has to be lower case,
- # because the Makefile cannot convert its library names to upper case)
-
- my $line = "USESTHORNS_$thorn = Cactus CactusBindings";
+ # because the Makefile cannot convert its library names to upper case)
+
+ my $line = "USESTHORNS_$thorn =";
+ # TR 29 Mar 2004:
+ # commented out following hard-coded dependency of all thorns
+ # on the flesh and bindings (which was necessary while the Fortran 90
+ # interface declarations were still included in the flesh and had to be
+ # compiled before thorns could use them)
+ # my $line = "USESTHORNS_$thorn = Cactus CactusBindings";
foreach my $dep (sort (split (' ', $configuration_database->{"\U$thorn\E USES THORNS"})))
{
$line .= " $dep";
@@ -409,7 +415,7 @@ sub CreateThornDependencyList
push (@varlist, $line);
push (@deplist, "\$(CCTK_LIBDIR)/\$(LIBNAME_PREFIX)$thorn\$(LIBNAME_SUFFIX): \$(USESTHORNS_$thorn:%=\$(CCTK_LIBDIR)/\$(LIBNAME_PREFIX)%\$(LIBNAME_SUFFIX))");
}
-
+
return (@varlist, @deplist);
}
@@ -436,7 +442,7 @@ sub RequiredThorns
@result = ();
foreach $i (split (' ', $config->{"\U$thorn\E USES THORNS"}) )
- {
+ {
if ($i eq $top)
{
CST_error (0, "Cross dependency detected between thorns '$thorn' and " .