aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreschnett <eschnett@83718e91-0e4f-0410-abf4-91180603181f>2010-09-23 23:29:44 +0000
committereschnett <eschnett@83718e91-0e4f-0410-abf4-91180603181f>2010-09-23 23:29:44 +0000
commit4349331c31908ef2330a93ddb5d0a96f0bff6f03 (patch)
treed35f4f05c245c65c3a13123488773040e4a676de
parentce20f4b59e5d8edbb41380e2405e21b271a60b1b (diff)
Correct building thorn source tarballs on systems with a small command
line length limit (e.g. AIX) git-svn-id: http://svn.cactuscode.org/arrangements/CactusUtils/Formaline/trunk@190 83718e91-0e4f-0410-abf4-91180603181f
-rw-r--r--src/make.configuration.deps6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/make.configuration.deps b/src/make.configuration.deps
index 2d90e35..dfb7d81 100644
--- a/src/make.configuration.deps
+++ b/src/make.configuration.deps
@@ -166,10 +166,10 @@ $(TARBALL_DIR)/cactus-flesh-source.ccldeps:
$(TARBALL_DIR)/cactus-thorn-source-%.o: $(TARBALL_DIR)/cactus-thorn-source-%.c
@echo "Creating Formaline tarball for thorn $*"
- cd $(TARBALL_DIR) && $(CC) $(CFLAGS) -c $^ $(^:%.c=%-????.c)
+ cd $(TARBALL_DIR) && $(CC) $(CFLAGS) -c $(patsubst $(TARBALL_DIR)/%, %, $^ $(^:%.c=%-????.c))
$(TARBALL_DIR)/cactus-thorn-source-%.c: $(TARBALL_DIR)/cactus-thorn-source-%.tar.gz $(CCTK_HOME)/arrangements/CactusUtils/Formaline/src/util/VERSION
- $(RM) -f $(@:%.c=%-????.c)
+ cd $(TARBALL_DIR) && $(RM) -f $(@:$(TARBALL_DIR)/%.c=%-????.c)
$(FORMALINE_BIN_DIR)/makeblob.pl $(@:%.c=%) $(patsubst %/,%,$(dir $(filter %/$(@:$(TARBALL_DIR)/cactus-thorn-source-%.c=%),$(THORNS)))) $(@:$(TARBALL_DIR)/cactus-thorn-source-%.c=%) < $<
$(TARBALL_DIR)/cactus-thorn-source-%.tar.gz: $(TARBALL_DIR)/cactus-thorn-source-%.files
@@ -246,7 +246,7 @@ else
# The list is long. Create the file via a set of rules, one rule per
# object file.
-FRM-OBJS-added = $(FRM-OBJS:%=%.added)
+FRM-OBJS-added = $(FRM-OBJS:%=%.added) $(FRM-OBJS-other:%=%.added)
.PHONY: $(FRM-LIB).objectlist.custom
$(FRM-LIB).objectlist.custom: $(FRM-OBJS-added)