Make cactus thorn lib names less likely to clash with system names

by prefixing  - currently use thorn_ for nostalgie reasons 8-)


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

3 files changed, 18 insertions, 27 deletions

diff --git a/lib/make/force-rebuild b/lib/make/force-rebuild
index 03c6d93f..cc693c82 100644
--- a/lib/make/force-rebuild
+++ b/lib/make/force-rebuild
@@ -5,7 +5,7 @@
 #   @desc 
 #   Timestamp file for forcing rebuilds of configurations
 #   @enddesc 
-#   @version $Id: force-rebuild,v 1.14 2004-08-03 13:34:08 schnetter Exp $
+#   @version $Id: force-rebuild,v 1.15 2004-11-30 23:22:00 goodale Exp $
 # @@*/
 
 06 Mar 2003: minor changes to CreateFunctionBindings.pl 
@@ -27,3 +27,5 @@
              parameters/variables in place (without requiring separate
              USE_CCTK_* macros)
 03 Aug 2004: Parse multiple schedule options correctly
+30 Nov 2004: Change name of thorn libraries.
+             (Rebuild because of Fortran deps from CST.)
diff --git a/lib/make/make.configuration b/lib/make/make.configuration
index 97da3aa8..836a2129 100644
--- a/lib/make/make.configuration
+++ b/lib/make/make.configuration
@@ -36,6 +36,7 @@ endif
 
 export MAKE_DIR  = $(CCTK_HOME)/lib/make
 
+CCTK_LIBNAME_PREFIX=thorn_
 FLESHLIB = Cactus
 BINDINGSLIB= CactusBindings
 
@@ -57,25 +58,11 @@ export PERLINTERP = $(shell echo $(PERL) | sed 's,^/cygdrive/\(.\)/,\1:/,' | sed
 # Use a phony main target to make sure we print a nice ending message 8-)
 .PHONY: main
 
-main: checklibs $(EXEDIR)$(DIRSEP)$(EXE)
+main: $(EXEDIR)$(DIRSEP)$(EXE)
 	@echo All done !
 	@echo $(DIVIDER)
 
 
-# Check whether the system libraries clash with the thorn libraries
-.PHONY: checklibs
-
-# Which Cactus libraries have the same name as system libraries?
-CLASHINGLIBS = $(strip $(foreach lib, $(ALLCACTUSLIBS), $(findstring $(lib), $(LIBS))))
-
-checklibs:
-	if test "$(CLASHINGLIBS)x" != "x"; then\
-	  echo "The thorn(s) '$(CLASHINGLIBS)' have the same names as sytem libraries.";\
-	  echo "This is not possible.";\
-	  exit 1;\
-	fi
-
-
 # Put this in temporarily to make sure that people with existing
 # configurations aren't disturbed
 
@@ -118,13 +105,15 @@ UTIL_DIR=$(EXEDIR)$(DIRSEP)$(CONFIG_NAME)
 
 
 # Build the list of all libraries
-ALLCACTUSLIBS = $(notdir $(CACTUSLIBS) $(THORN_LINKLIST) $(CACTUSLIBS))
+ALLCACTUSLIBS_BASE = $(notdir $(CACTUSLIBS) $(THORN_LINKLIST) $(CACTUSLIBS))
+
+ALLCACTUSLIBS = $(ALLCACTUSLIBS_BASE:%=$(CCTK_LIBNAME_PREFIX)%)
 
 # Include all required external libraries from configuration
 -include $(TOP)/bindings/Configuration/make.link
 
 # Build the executable
-$(EXEDIR)$(DIRSEP)$(EXE): $(CONFIG)/make.thornlist $(CONFIG)/cctki_version.h $(patsubst %,$(CCTK_LIBDIR)/$(LIBNAME_PREFIX)%$(LIBNAME_SUFFIX),$(notdir $(THORNS) $(CACTUSLIBS)))
+$(EXEDIR)$(DIRSEP)$(EXE): $(CONFIG)/make.thornlist $(CONFIG)/cctki_version.h $(patsubst %,$(CCTK_LIBDIR)/$(LIBNAME_PREFIX)$(CCTK_LIBNAME_PREFIX)%$(LIBNAME_SUFFIX),$(notdir $(THORNS) $(CACTUSLIBS)))
 	@echo Creating $(EXE) in $(EXEDIR) from $(THORNS)
 	$(CC) $(OPTIMISE_C) $(DEBUG_C) $(CFLAGS) $(CCOMPILEONLY)$(OPTIONSEP)"$(call TRANSFORM_DIRS,$(TOP)/datestamp.o)" -I"$(call TRANSFORM_DIRS,$(CCTK_HOME)/src/include)" -I"$(call TRANSFORM_DIRS,$(CONFIG))" "$(call TRANSFORM_DIRS,$(DATESTAMP))"
 	if [ ! -d $(EXEDIR) ]; then $(MKDIR) $(MKDIRFLAGS) $(EXEDIR) ; fi
@@ -152,9 +141,9 @@ $(CONFIG)/cctki_version.h: $(CCTK_HOME)/Makefile
 # Checks if the library is Cactus, in which case it uses the main source
 # directory.
 
-$(CCTK_LIBDIR)/$(LIBNAME_PREFIX)%$(LIBNAME_SUFFIX): update
+$(CCTK_LIBDIR)/$(LIBNAME_PREFIX)$(CCTK_LIBNAME_PREFIX)%$(LIBNAME_SUFFIX): update
         # (the mkdir below is protected against parallel makes)
-	@thorn_name=$(@:$(CCTK_LIBDIR)/$(LIBNAME_PREFIX)%$(LIBNAME_SUFFIX)=%) ; \
+	@thorn_name=$(@:$(CCTK_LIBDIR)/$(LIBNAME_PREFIX)$(CCTK_LIBNAME_PREFIX)%$(LIBNAME_SUFFIX)=%) ; \
 	echo "Checking status of thorn $$thorn_name" ; \
 	if [ ! -d $(SCRATCH_BUILD) ] ; \
 	then \
@@ -182,7 +171,7 @@ $(CCTK_LIBDIR)/$(LIBNAME_PREFIX)%$(LIBNAME_SUFFIX): update
 		then \
 			src_dir=$(BINDINGS_DIR) ; \
 		else \
-			src_dir=$(PACKAGE_DIR)/$(@:$(CCTK_LIBDIR)/$(LIBNAME_PREFIX)%$(LIBNAME_SUFFIX)=$(filter %/$(@:$(CCTK_LIBDIR)/$(LIBNAME_PREFIX)%$(LIBNAME_SUFFIX)=%), $(THORNS)))/src ; \
+			src_dir=$(PACKAGE_DIR)/$(@:$(CCTK_LIBDIR)/$(LIBNAME_PREFIX)$(CCTK_LIBNAME_PREFIX)%$(LIBNAME_SUFFIX)=$(filter %/$(@:$(CCTK_LIBDIR)/$(LIBNAME_PREFIX)$(CCTK_LIBNAME_PREFIX)%$(LIBNAME_SUFFIX)=%), $(THORNS)))/src ; \
 		fi ; \
 	fi ; \
 	if [ ! -d $(BUILD_DIR)/$$thorn_name ]; \
@@ -197,7 +186,7 @@ $(CCTK_LIBDIR)/$(LIBNAME_PREFIX)%$(LIBNAME_SUFFIX): update
 	else \
 		make_file=$(MAKE_DIR)/make.thornlib ; \
 	fi ; \
-	$(MAKE) TOP=$(TOP) SRCDIR=$$src_dir CONFIG=$(CONFIG) NAME=$@ THORN=$$thorn_name USESTHORNS="$(USESTHORNS_$(@:$(CCTK_LIBDIR)/$(LIBNAME_PREFIX)%$(LIBNAME_SUFFIX)=%))" -f $$make_file $(FPARFLAGS)
+	$(MAKE) TOP=$(TOP) SRCDIR=$$src_dir CONFIG=$(CONFIG) NAME=$@ THORN=$$thorn_name USESTHORNS="$(USESTHORNS_$(@:$(CCTK_LIBDIR)/$(LIBNAME_PREFIX)$(CCTK_LIBNAME_PREFIX)%$(LIBNAME_SUFFIX)=%))" -f $$make_file $(FPARFLAGS)
 	@echo $(DIVIDER)
 
 
@@ -298,10 +287,10 @@ realclean:
 
 # This target will build only a subset of the thorns for a given configuration.
 # It also warns about thorns which don't exist.
-THORN_BUILDLIST = $(filter $(ALLCACTUSLIBS), $(BUILDLIST))
-UNKNOWN_THORNS = $(filter-out $(ALLCACTUSLIBS), $(BUILDLIST))
+THORN_BUILDLIST = $(filter $(ALLCACTUSLIBS_BASE), $(BUILDLIST))
+UNKNOWN_THORNS = $(filter-out $(ALLCACTUSLIBS_BASE), $(BUILDLIST))
 
-build: $(CONFIG)/make.thornlist $(CONFIG)/cctki_version.h $(patsubst %, $(CCTK_LIBDIR)/$(LIBNAME_PREFIX)%$(LIBNAME_SUFFIX), $(THORN_BUILDLIST))
+build: $(CONFIG)/make.thornlist $(CONFIG)/cctki_version.h $(patsubst %, $(CCTK_LIBDIR)/$(LIBNAME_PREFIX)$(CCTK_LIBNAME_PREFIX)%$(LIBNAME_SUFFIX), $(THORN_BUILDLIST))
 	if test "x$(UNKNOWN_THORNS)" != "x"; then \
 	  echo "WARNING: Don't know anything about '$(UNKNOWN_THORNS)' !"; \
 	  echo $(DIVIDER); \
diff --git a/lib/sbin/CST b/lib/sbin/CST
index f15383e9..e3cf03ef 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.72 2004-08-27 03:20:39 goodale Exp $
+#  @version   $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/sbin/CST,v 1.73 2004-11-30 23:22:00 goodale Exp $
 #@@*/
 
 # Global parameter to track the number of errors from the CST
@@ -425,7 +425,7 @@ sub CreateThornDependencyList
       $line .= " $dep" if ($dep ne $thorn);
     }
     push (@varlist, $line);
-    push (@deplist, "\$(CCTK_LIBDIR)/\$(LIBNAME_PREFIX)$thorn\$(LIBNAME_SUFFIX): \$(USESTHORNS_$thorn:%=\$(CCTK_LIBDIR)/\$(LIBNAME_PREFIX)%\$(LIBNAME_SUFFIX))");
+    push (@deplist, "\$(CCTK_LIBDIR)/\$(LIBNAME_PREFIX)\$(CCTK_LIBNAME_PREFIX)$thorn\$(LIBNAME_SUFFIX): \$(USESTHORNS_$thorn:%=\$(CCTK_LIBDIR)/\$(LIBNAME_PREFIX)\$(CCTK_LIBNAME_PREFIX)%\$(LIBNAME_SUFFIX))");
   }
 
   return (@varlist, @deplist);