From d7d16dc1fb7e65a7eefbb4bcbae6fdf3aef5755d Mon Sep 17 00:00:00 2001
From: schnetter <schnetter@17b73243-c579-4c4c-a9d2-2d5706c11dac>
Date: Mon, 21 May 2007 20:58:16 +0000
Subject: Build a configuration in two steps: First create make.thornlib, then
 build all thorns.  This seems to make "make" honour the "-j" options when
 building the thorns.

git-svn-id: http://svn.cactuscode.org/flesh/trunk@4420 17b73243-c579-4c4c-a9d2-2d5706c11dac
---
 Makefile                    | 3 ++-
 lib/make/make.configuration | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 82b82fba..846810d1 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@
 #
 #
 #   @enddesc
-#   @version $Id: Makefile,v 1.174 2006-06-06 15:25:39 rideout Exp $
+#   @version $Id: Makefile,v 1.175 2007-05-21 20:58:15 schnetter Exp $
 # @@*/
 
 ##################################################################################
@@ -272,6 +272,7 @@ $(CONFIGURATIONS):
 	  echo "Building configuration $@"; \
 	  echo $(DIVIDER);\
 	fi
+	$(MAKE) -f $(CCTK_HOME)/lib/make/make.configuration TOP=$(CONFIGS_DIR)/$@ CCTK_HOME=$(CCTK_HOME) $(TPARFLAGS) rebuild
 	$(MAKE) -f $(CCTK_HOME)/lib/make/make.configuration TOP=$(CONFIGS_DIR)/$@ CCTK_HOME=$(CCTK_HOME) $(TPARFLAGS)
 
 # Clean target
diff --git a/lib/make/make.configuration b/lib/make/make.configuration
index 94268a2e..9c6b0a51 100644
--- a/lib/make/make.configuration
+++ b/lib/make/make.configuration
@@ -206,6 +206,8 @@ include $(CONFIG)/make.config.deps
 
 # Rule to build the make.thornlist file from the ThornList file
 
+rebuild: $(CONFIG)/make.thornlist
+
 $(CONFIG)/make.thornlist: $(TOP)/ThornList $(foreach lib, $(CCTK_HOME)/src $(THORNS:%=$(PACKAGE_DIR)/%), $(lib)/param.ccl $(lib)/interface.ccl $(lib)/schedule.ccl) $(CONFIG_THORNS:%=$(PACKAGE_DIR)/%/configuration.ccl) $(CCTK_HOME)/lib/make/force-rebuild
 	if [ -r $@ ] ; then echo Reconfiguring thorns ; rm $@ ;\
 	else echo Processing CCL files ; fi
-- 
cgit v1.2.3