From ce20f4b59e5d8edbb41380e2405e21b271a60b1b Mon Sep 17 00:00:00 2001
From: eschnett <eschnett@83718e91-0e4f-0410-abf4-91180603181f>
Date: Fri, 6 Aug 2010 21:45:20 +0000
Subject: Correct error in autogeneration of tarballs.

Not all files were compiled, leading to zero-length tarballs when output.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusUtils/Formaline/trunk@189 83718e91-0e4f-0410-abf4-91180603181f
---
 src/make.configuration.deps | 3 ++-
 src/util/VERSION            | 1 +
 src/util/makeblob.pl        | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/make.configuration.deps b/src/make.configuration.deps
index 04ec21d..2d90e35 100644
--- a/src/make.configuration.deps
+++ b/src/make.configuration.deps
@@ -32,6 +32,7 @@ FRM-LIB = $(CCTK_LIBDIR)/$(LIBNAME_PREFIX)$(CCTK_LIBNAME_PREFIX)Formaline-cactus
 $(EXEDIR)$(DIRSEP)$(EXE): $(FRM-LIB)
 
 FRM-OBJS = $(TARBALL_DIR)/cactus-meta-source.o $(TARBALL_DIR)/build-id.o $(TARBALL_DIR)/cactus-flesh-source.o $(patsubst %,$(TARBALL_DIR)/cactus-thorn-source-%.o,$(notdir $(THORNS)))
+FRM-OBJS-other = $(TARBALL_DIR)/cactus-flesh-source-????.o $(patsubst %,$(TARBALL_DIR)/cactus-thorn-source-%-????.o,$(notdir $(THORNS)))
 
 $(FRM-LIB): $(FRM-OBJS)
 #	$(AR) $(ARFLAGS) $@ $^
@@ -238,7 +239,7 @@ ifeq ($(shell test $(FRM-OBJS-words) -le $(FRM-OBJS-words-max) && echo 1), 1)
 
 .PHONY: $(FRM-LIB).objectlist.custom
 $(FRM-LIB).objectlist.custom:
-	echo $(FRM-OBJS) > $(FRM-LIB).objectlist
+	echo $(FRM-OBJS) $(FRM-OBJS-other) > $(FRM-LIB).objectlist
 
 else
 
diff --git a/src/util/VERSION b/src/util/VERSION
index d23d03d..bdcaa7f 100644
--- a/src/util/VERSION
+++ b/src/util/VERSION
@@ -4,3 +4,4 @@ Thus, whenever this file changes, all auto-generated files are recreated.
 
 2005-08-22: Change layout of struct sourceinfo
 2010-06-23: Move thorn to a new arrangement
+2010-08-06: Correct severe error in autogeneration
diff --git a/src/util/makeblob.pl b/src/util/makeblob.pl
index 55badce..4a4fa8c 100755
--- a/src/util/makeblob.pl
+++ b/src/util/makeblob.pl
@@ -61,7 +61,7 @@ EOF
     
     print FILE "\n";
     if (! $done) {
-        print FILE "struct datainfo const cactus_data_${fcount_next}_${thorn};\n";
+        print FILE "extern struct datainfo const cactus_data_${fcount_next}_${thorn};\n";
     }
     print FILE "struct datainfo const cactus_data_${fcount}_${thorn} =\n";
     print FILE "{\n";
@@ -104,7 +104,7 @@ struct sourceinfo
   char const * thorn;
 };
 
-struct datainfo const cactus_data_0000_$thorn;
+extern struct datainfo const cactus_data_0000_$thorn;
 struct sourceinfo const cactus_source_$thorn =
 {
   & cactus_data_0000_$thorn,
-- 
cgit v1.2.3