From 7c1331bbd0f09a27f6c6cf3f29aeae20caa79b54 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Wed, 2 Feb 2000 10:38:01 +0000 Subject: [PATCH] Make makefiles MT aware. git-svn-id: https://svn.dealii.org/trunk@2316 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/Attic/examples/convergence/Makefile | 7 +++++++ deal.II/deal.II/Attic/examples/dof/Makefile | 5 +++++ deal.II/deal.II/Attic/examples/error-estimation/Makefile | 5 +++++ deal.II/deal.II/Attic/examples/grid/Makefile | 5 +++++ deal.II/deal.II/Attic/examples/multigrid/Makefile | 5 +++++ .../examples/nonlinear/fixed-point-iteration/Makefile | 5 +++++ deal.II/deal.II/Attic/examples/poisson/Makefile | 5 +++++ tests/big-tests/convergence/Makefile | 7 +++++++ tests/big-tests/dof/Makefile | 5 +++++ tests/big-tests/error-estimation/Makefile | 5 +++++ tests/big-tests/grid/Makefile | 5 +++++ tests/big-tests/multigrid/Makefile | 5 +++++ tests/big-tests/nonlinear/fixed-point-iteration/Makefile | 5 +++++ tests/big-tests/poisson/Makefile | 5 +++++ 14 files changed, 74 insertions(+) diff --git a/deal.II/deal.II/Attic/examples/convergence/Makefile b/deal.II/deal.II/Attic/examples/convergence/Makefile index dae78cbddb..c0815b3799 100644 --- a/deal.II/deal.II/Attic/examples/convergence/Makefile +++ b/deal.II/deal.II/Attic/examples/convergence/Makefile @@ -71,6 +71,13 @@ flags = $(CXXFLAGS.o) endif +# If in multithread mode, add the ACE library to the libraries which +# we need to link with: +ifneq ($(with-multithreading),no) + libraries += $(lib-ACE) +endif + + # make rule for the target $(target) : $(libraries) diff --git a/deal.II/deal.II/Attic/examples/dof/Makefile b/deal.II/deal.II/Attic/examples/dof/Makefile index 82401e23ed..3f7be46d14 100644 --- a/deal.II/deal.II/Attic/examples/dof/Makefile +++ b/deal.II/deal.II/Attic/examples/dof/Makefile @@ -73,6 +73,11 @@ libraries = $(libs) flags = $(CXXFLAGS) endif +# If in multithread mode, add the ACE library to the libraries which +# we need to link with: +ifneq ($(with-multithreading),no) + libraries += $(lib-ACE) +endif # make rule for the target diff --git a/deal.II/deal.II/Attic/examples/error-estimation/Makefile b/deal.II/deal.II/Attic/examples/error-estimation/Makefile index ce492a697e..3744bd3dbd 100644 --- a/deal.II/deal.II/Attic/examples/error-estimation/Makefile +++ b/deal.II/deal.II/Attic/examples/error-estimation/Makefile @@ -75,6 +75,11 @@ libraries = $(libs) flags = $(CXXFLAGS) endif +# If in multithread mode, add the ACE library to the libraries which +# we need to link with: +ifneq ($(with-multithreading),no) + libraries += $(lib-ACE) +endif # make rule for the target diff --git a/deal.II/deal.II/Attic/examples/grid/Makefile b/deal.II/deal.II/Attic/examples/grid/Makefile index d6edea4a30..9bd38ee827 100644 --- a/deal.II/deal.II/Attic/examples/grid/Makefile +++ b/deal.II/deal.II/Attic/examples/grid/Makefile @@ -73,6 +73,11 @@ libraries = $(libs) flags = $(CXXFLAGS) endif +# If in multithread mode, add the ACE library to the libraries which +# we need to link with: +ifneq ($(with-multithreading),no) + libraries += $(lib-ACE) +endif # make rule for the target diff --git a/deal.II/deal.II/Attic/examples/multigrid/Makefile b/deal.II/deal.II/Attic/examples/multigrid/Makefile index f5d4be0a4b..6ed598d433 100644 --- a/deal.II/deal.II/Attic/examples/multigrid/Makefile +++ b/deal.II/deal.II/Attic/examples/multigrid/Makefile @@ -72,6 +72,11 @@ flags = $(CXXFLAGS) endif +# If in multithread mode, add the ACE library to the libraries which +# we need to link with: +ifneq ($(with-multithreading),no) + libraries += $(lib-ACE) +endif # make rule for the target $(target) : $(libraries) diff --git a/deal.II/deal.II/Attic/examples/nonlinear/fixed-point-iteration/Makefile b/deal.II/deal.II/Attic/examples/nonlinear/fixed-point-iteration/Makefile index eb69a945e5..0010ae461f 100644 --- a/deal.II/deal.II/Attic/examples/nonlinear/fixed-point-iteration/Makefile +++ b/deal.II/deal.II/Attic/examples/nonlinear/fixed-point-iteration/Makefile @@ -72,6 +72,11 @@ libraries = $(libs) flags = $(CXXFLAGS) endif +# If in multithread mode, add the ACE library to the libraries which +# we need to link with: +ifneq ($(with-multithreading),no) + libraries += $(lib-ACE) +endif # make rule for the target diff --git a/deal.II/deal.II/Attic/examples/poisson/Makefile b/deal.II/deal.II/Attic/examples/poisson/Makefile index 313599ef7f..2c1e787bc5 100644 --- a/deal.II/deal.II/Attic/examples/poisson/Makefile +++ b/deal.II/deal.II/Attic/examples/poisson/Makefile @@ -73,6 +73,11 @@ libraries = $(libs) flags = $(CXXFLAGS) endif +# If in multithread mode, add the ACE library to the libraries which +# we need to link with: +ifneq ($(with-multithreading),no) + libraries += $(lib-ACE) +endif # make rule for the target diff --git a/tests/big-tests/convergence/Makefile b/tests/big-tests/convergence/Makefile index dae78cbddb..c0815b3799 100644 --- a/tests/big-tests/convergence/Makefile +++ b/tests/big-tests/convergence/Makefile @@ -71,6 +71,13 @@ flags = $(CXXFLAGS.o) endif +# If in multithread mode, add the ACE library to the libraries which +# we need to link with: +ifneq ($(with-multithreading),no) + libraries += $(lib-ACE) +endif + + # make rule for the target $(target) : $(libraries) diff --git a/tests/big-tests/dof/Makefile b/tests/big-tests/dof/Makefile index 82401e23ed..3f7be46d14 100644 --- a/tests/big-tests/dof/Makefile +++ b/tests/big-tests/dof/Makefile @@ -73,6 +73,11 @@ libraries = $(libs) flags = $(CXXFLAGS) endif +# If in multithread mode, add the ACE library to the libraries which +# we need to link with: +ifneq ($(with-multithreading),no) + libraries += $(lib-ACE) +endif # make rule for the target diff --git a/tests/big-tests/error-estimation/Makefile b/tests/big-tests/error-estimation/Makefile index ce492a697e..3744bd3dbd 100644 --- a/tests/big-tests/error-estimation/Makefile +++ b/tests/big-tests/error-estimation/Makefile @@ -75,6 +75,11 @@ libraries = $(libs) flags = $(CXXFLAGS) endif +# If in multithread mode, add the ACE library to the libraries which +# we need to link with: +ifneq ($(with-multithreading),no) + libraries += $(lib-ACE) +endif # make rule for the target diff --git a/tests/big-tests/grid/Makefile b/tests/big-tests/grid/Makefile index d6edea4a30..9bd38ee827 100644 --- a/tests/big-tests/grid/Makefile +++ b/tests/big-tests/grid/Makefile @@ -73,6 +73,11 @@ libraries = $(libs) flags = $(CXXFLAGS) endif +# If in multithread mode, add the ACE library to the libraries which +# we need to link with: +ifneq ($(with-multithreading),no) + libraries += $(lib-ACE) +endif # make rule for the target diff --git a/tests/big-tests/multigrid/Makefile b/tests/big-tests/multigrid/Makefile index f5d4be0a4b..6ed598d433 100644 --- a/tests/big-tests/multigrid/Makefile +++ b/tests/big-tests/multigrid/Makefile @@ -72,6 +72,11 @@ flags = $(CXXFLAGS) endif +# If in multithread mode, add the ACE library to the libraries which +# we need to link with: +ifneq ($(with-multithreading),no) + libraries += $(lib-ACE) +endif # make rule for the target $(target) : $(libraries) diff --git a/tests/big-tests/nonlinear/fixed-point-iteration/Makefile b/tests/big-tests/nonlinear/fixed-point-iteration/Makefile index eb69a945e5..0010ae461f 100644 --- a/tests/big-tests/nonlinear/fixed-point-iteration/Makefile +++ b/tests/big-tests/nonlinear/fixed-point-iteration/Makefile @@ -72,6 +72,11 @@ libraries = $(libs) flags = $(CXXFLAGS) endif +# If in multithread mode, add the ACE library to the libraries which +# we need to link with: +ifneq ($(with-multithreading),no) + libraries += $(lib-ACE) +endif # make rule for the target diff --git a/tests/big-tests/poisson/Makefile b/tests/big-tests/poisson/Makefile index 313599ef7f..2c1e787bc5 100644 --- a/tests/big-tests/poisson/Makefile +++ b/tests/big-tests/poisson/Makefile @@ -73,6 +73,11 @@ libraries = $(libs) flags = $(CXXFLAGS) endif +# If in multithread mode, add the ACE library to the libraries which +# we need to link with: +ifneq ($(with-multithreading),no) + libraries += $(lib-ACE) +endif # make rule for the target -- 2.39.5