diff options
| author | schnetter <schnetter@83718e91-0e4f-0410-abf4-91180603181f> | 2007-08-22 17:39:55 +0000 |
|---|---|---|
| committer | schnetter <schnetter@83718e91-0e4f-0410-abf4-91180603181f> | 2007-08-22 17:39:55 +0000 |
| commit | 61936ebe545653ba5e1ee744670e8412aaa0b9cc (patch) | |
| tree | c19dedc1e705c6ceaf5caeeb26c05a6d32cf79fa | |
| parent | dcf7f5fac40b4b982f4ebb31d86fa865683cac4c (diff) | |
Use the suffix ".objectlist.custom" instead of ".objectlist" when
calling make.configuration recursively.
git-svn-id: http://svn.cactuscode.org/arrangements/CactusUtils/Formaline/trunk@129 83718e91-0e4f-0410-abf4-91180603181f
| -rw-r--r-- | src/make.configuration.deps | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/make.configuration.deps b/src/make.configuration.deps index 8e40f85..4298906 100644 --- a/src/make.configuration.deps +++ b/src/make.configuration.deps @@ -31,7 +31,7 @@ FRM-OBJS = $(TARBALL_DIR)/cactus-meta-source.o $(TARBALL_DIR)/build-id.o $(TARBA $(FRM-LIB): $(FRM-OBJS) # $(AR) $(ARFLAGS) $@ $^ - $(MAKE) -f $(MAKE_DIR)/make.configuration $(FRM-LIB).objectlist + $(MAKE) -f $(MAKE_DIR)/make.configuration $(FRM-LIB).objectlist.custom xargs -n $(FRM-OBJS-words-max) $(AR) $(ARFLAGS) $@ < $(FRM-LIB).objectlist $(RM) $(FRM-LIB).objectlist if test "x$(USE_RANLIB)" = "xyes" ; then $(RANLIB) $(RANLIBFLAGS) $@ ; fi @@ -108,6 +108,8 @@ $(TARBALL_DIR)/cactus-flesh-source.tar.gz: $(TARBALL_DIR)/cactus-flesh-source.fi $(TARBALL_DIR)/cactus-flesh-source.files: $(CCTK_LIBDIR)/$(LIBNAME_PREFIX)$(CCTK_LIBNAME_PREFIX)$(FLESHLIB)$(LIBNAME_SUFFIX) $(TARBALL_DIR)/cactus-flesh-source.ccldeps cd $(CCTK_HOME) && \ find CONTRIBUTORS COPYRIGHT Makefile lib src \ + `ls configs/$(notdir $(TOP))/OptionList 2> /dev/null` \ + `ls configs/$(notdir $(TOP))/ScriptFile 2> /dev/null` \ configs/$(notdir $(TOP))/ThornList \ configs/$(notdir $(TOP))/config-data \ configs/$(notdir $(TOP))/config-info \ @@ -194,8 +196,8 @@ ifeq ($(shell test $(FRM-OBJS-words) -le $(FRM-OBJS-words-max) && echo 1), 1) # The list is short. Create the file directly, which is faster. -.PHONY: $(FRM-LIB).objectlist -$(FRM-LIB).objectlist: +.PHONY: $(FRM-LIB).objectlist.custom +$(FRM-LIB).objectlist.custom: echo $(FRM-OBJS) > $(FRM-LIB).objectlist else @@ -205,8 +207,8 @@ else FRM-OBJS-added = $(FRM-OBJS:%=%.added) -.PHONY: $(FRM-LIB).objectlist -$(FRM-LIB).objectlist: $(FRM-OBJS-added) +.PHONY: $(FRM-LIB).objectlist.custom +$(FRM-LIB).objectlist.custom: $(FRM-OBJS-added) # Truncate the file .PHONY: $(FRM-LIB).objectlist.create |