diff options
| author | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2000-05-15 08:11:00 +0000 |
|---|---|---|
| committer | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2000-05-15 08:11:00 +0000 |
| commit | 8fb8d4b17c47728fd7d2a132b43fa085dca277f3 (patch) | |
| tree | 60d89f0be4a5cfd7bed43b221a478759174e6308 | |
| parent | 7b7bb5ff4f3cc6220111bbea6821bd8a3dfdf83a (diff) | |
Removing the -j flag from calls to sub-makes unless the TJOBS or
FJOBS has been set.
This resolves PR 351.
Tom
git-svn-id: http://svn.cactuscode.org/flesh/trunk@1664 17b73243-c579-4c4c-a9d2-2d5706c11dac
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | lib/make/make.configuration | 2 |
2 files changed, 10 insertions, 6 deletions
@@ -16,7 +16,7 @@ # # # @enddesc -# @version $Id: Makefile,v 1.91 2000-05-05 12:14:59 allen Exp $ +# @version $Id: Makefile,v 1.92 2000-05-15 08:10:59 goodale Exp $ # @@*/ ################################################################################## @@ -46,15 +46,19 @@ endif # Stuff for parallel makes # TJOBS is the number of thorns to compile in parallel ifeq ($(strip $(TJOBS)), ) -TJOBS = 1 +TPARFLAGS = +else +TPARFLAGS = -j $(TJOBS) endif # FJOBS is the number of files within a thorn to compile in parallel ifeq ($(strip $(FJOBS)), ) -FJOBS = 1 +FPARFLAGS = +else +FPARFLAGS = -j $(FJOBS) endif -export TJOBS FJOBS +export TPARFLAGS FPARFLAGS # Directory for configuration options ifeq ($(strip $(THORNLIST_DIR)), ) @@ -224,7 +228,7 @@ endif $(CONFIGURATIONS): cd $(CONFIGS_DIR)/$@ - $(MAKE) -f $(CCTK_HOME)/lib/make/make.configuration TOP=$(CONFIGS_DIR)/$@ CCTK_HOME=$(CCTK_HOME) -j $(TJOBS) + $(MAKE) -f $(CCTK_HOME)/lib/make/make.configuration TOP=$(CONFIGS_DIR)/$@ CCTK_HOME=$(CCTK_HOME) $(TPARFLAGS) # Clean target .PHONY: distclean diff --git a/lib/make/make.configuration b/lib/make/make.configuration index 403b846e..8135a0bb 100644 --- a/lib/make/make.configuration +++ b/lib/make/make.configuration @@ -106,7 +106,7 @@ $(CCTK_LIBDIR)/lib%.a: update cd $(BUILD_DIR)/$$thorn_name ; \ if [ -r "$$src_dir/Makefile" ] ; then make_file=$$src_dir/Makefile ; \ else make_file=$(MAKE_DIR)/make.thornlib ; fi ; \ - $(MAKE) TOP=$(TOP) SRCDIR=$$src_dir CONFIG=$(CONFIG) NAME=$@ THORN=$$thorn_name -f $$make_file -j $(FJOBS) + $(MAKE) TOP=$(TOP) SRCDIR=$$src_dir CONFIG=$(CONFIG) NAME=$@ THORN=$$thorn_name -f $$make_file $(FPARFLAGS) @echo $(DIVIDER) |