From 3be8092801cbf7d5f7d752ff5b176e5c721c6c88 Mon Sep 17 00:00:00 2001 From: wolf Date: Wed, 26 Jan 2000 16:16:58 +0000 Subject: [PATCH] Support shared libs. git-svn-id: https://svn.dealii.org/trunk@2269 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/Attic/examples/convergence/Makefile | 10 ++++++++-- deal.II/deal.II/Attic/examples/dof/Makefile | 12 ++++++++++-- .../deal.II/Attic/examples/error-estimation/Makefile | 10 ++++++++-- deal.II/deal.II/Attic/examples/grid/Makefile | 12 ++++++++++-- deal.II/deal.II/Attic/examples/multigrid/Makefile | 11 +++++++++-- .../nonlinear/fixed-point-iteration/Makefile | 10 ++++++++-- deal.II/deal.II/Attic/examples/poisson/Makefile | 11 +++++++++-- .../Attic/examples/step-by-step/step-1/Makefile | 11 +++++++---- .../Attic/examples/step-by-step/step-2/Makefile | 8 ++++++-- .../Attic/examples/step-by-step/step-3/Makefile | 8 ++++++-- .../Attic/examples/step-by-step/step-4/Makefile | 10 ++++++++-- .../Attic/examples/step-by-step/step-5/Makefile | 8 ++++++-- .../Attic/examples/step-by-step/step-6/Makefile | 8 ++++++-- .../Attic/examples/step-by-step/step-8/Makefile | 8 ++++++-- deal.II/examples/step-1/Makefile | 11 +++++++---- deal.II/examples/step-2/Makefile | 8 ++++++-- deal.II/examples/step-3/Makefile | 8 ++++++-- deal.II/examples/step-4/Makefile | 10 ++++++++-- deal.II/examples/step-5/Makefile | 8 ++++++-- deal.II/examples/step-6/Makefile | 8 ++++++-- deal.II/examples/step-8/Makefile | 8 ++++++-- tests/big-tests/convergence/Makefile | 10 ++++++++-- tests/big-tests/dof/Makefile | 12 ++++++++++-- tests/big-tests/error-estimation/Makefile | 10 ++++++++-- tests/big-tests/grid/Makefile | 12 ++++++++++-- tests/big-tests/multigrid/Makefile | 11 +++++++++-- .../nonlinear/fixed-point-iteration/Makefile | 10 ++++++++-- tests/big-tests/poisson/Makefile | 11 +++++++++-- 28 files changed, 214 insertions(+), 60 deletions(-) diff --git a/deal.II/deal.II/Attic/examples/convergence/Makefile b/deal.II/deal.II/Attic/examples/convergence/Makefile index 2cbefdbd72..dae78cbddb 100644 --- a/deal.II/deal.II/Attic/examples/convergence/Makefile +++ b/deal.II/deal.II/Attic/examples/convergence/Makefile @@ -49,8 +49,14 @@ h-files = $(filter-out *%, $(shell echo *.h)) lib-h-files = $(filter-out *%, $(shell echo ../../include/*/*.h)) # list of libraries needed to link with -libs = ./Obj.a -ldeal_II_2d -llac -lbase -libs.g = ./Obj.g.a -ldeal_II_2d.g -llac.g -lbase.g +libs.g = ./Obj.g.a \ + $(lib-deal2-2d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libs = ./Obj.a \ + $(lib-deal2-2d.o) \ + $(lib-lac.o) \ + $(lib-base.o) # check whether we use debug mode or not diff --git a/deal.II/deal.II/Attic/examples/dof/Makefile b/deal.II/deal.II/Attic/examples/dof/Makefile index 46b8df97c3..82401e23ed 100644 --- a/deal.II/deal.II/Attic/examples/dof/Makefile +++ b/deal.II/deal.II/Attic/examples/dof/Makefile @@ -50,8 +50,16 @@ h-files = $(filter-out *%, $(shell echo *.h)) lib-h-files = $(filter-out *%, $(shell echo ../../include/*/*.h)) # list of libraries needed to link with -libs = ./Obj.a ../../lib/libdeal_II_2d.a ../../lib/libdeal_II_3d.a ../../../lac/lib/liblac.a ../../../base/lib/libbase.a -libs.g = ./Obj.g.a ../../lib/libdeal_II_2d.g.a ../../lib/libdeal_II_3d.g.a ../../../lac/lib/liblac.g.a ../../../base/lib/libbase.g.a ../../../base/lib/libbase.g.a +libs.g = ./Obj.g.a \ + $(lib-deal2-2d.g) \ + $(lib-deal2-3d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libs = ./Obj.a \ + $(lib-deal2-2d.o) \ + $(lib-deal2-3d.o) \ + $(lib-lac.o) \ + $(lib-base.o) # check whether we use debug mode or not diff --git a/deal.II/deal.II/Attic/examples/error-estimation/Makefile b/deal.II/deal.II/Attic/examples/error-estimation/Makefile index 180aa8b7a3..ce492a697e 100644 --- a/deal.II/deal.II/Attic/examples/error-estimation/Makefile +++ b/deal.II/deal.II/Attic/examples/error-estimation/Makefile @@ -55,8 +55,14 @@ h-files = $(filter-out *%, $(shell echo *.h)) lib-h-files = $(filter-out *%, $(shell echo ../../include/*/*.h)) # list of libraries needed to link with -libs = ./Obj.a -ldeal_II_2d -llac -lbase -libs.g = ./Obj.g.a -ldeal_II_2d.g -llac.g -lbase.g +libs.g = ./Obj.g.a \ + $(lib-deal2-2d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libs = ./Obj.a \ + $(lib-deal2-2d.o) \ + $(lib-lac.o) \ + $(lib-base.o) # check whether we use debug mode or not ifeq ($(debug-mode),on) diff --git a/deal.II/deal.II/Attic/examples/grid/Makefile b/deal.II/deal.II/Attic/examples/grid/Makefile index 1be0febb07..d6edea4a30 100644 --- a/deal.II/deal.II/Attic/examples/grid/Makefile +++ b/deal.II/deal.II/Attic/examples/grid/Makefile @@ -50,8 +50,16 @@ h-files = $(filter-out *%, $(shell echo *.h)) lib-h-files = $(filter-out *%, $(shell echo ../../include/*/*.h)) # list of libraries needed to link with -libs = ./Obj.a ../../lib/libdeal_II_2d.g.a ../../lib/libdeal_II_3d.a ../../../lac/lib/liblac.a ../../../base/lib/libbase.a -libs.g = ./Obj.g.a ../../lib/libdeal_II_2d.g.a ../../lib/libdeal_II_3d.g.a ../../../lac/lib/liblac.g.a ../../../base/lib/libbase.g.a +libs.g = ./Obj.g.a \ + $(lib-deal2-2d.g) \ + $(lib-deal2-3d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libs = ./Obj.a \ + $(lib-deal2-2d.o) \ + $(lib-deal2-3d.o) \ + $(lib-lac.o) \ + $(lib-base.o) # check whether we use debug mode or not diff --git a/deal.II/deal.II/Attic/examples/multigrid/Makefile b/deal.II/deal.II/Attic/examples/multigrid/Makefile index 63557adbdc..f5d4be0a4b 100644 --- a/deal.II/deal.II/Attic/examples/multigrid/Makefile +++ b/deal.II/deal.II/Attic/examples/multigrid/Makefile @@ -50,8 +50,15 @@ h-files = $(filter-out *%, $(shell echo *.h)) lib-h-files = $(filter-out *%, $(shell echo ../../include/*/*.h)) # list of libraries needed to link with -libs = ./Obj.a -ldeal_II_2d -llac -lbase -libs.g = ./Obj.g.a -ldeal_II_2d.g -llac.g -lbase.g +libs.g = ./Obj.g.a \ + $(lib-deal2-2d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libs = ./Obj.a \ + $(lib-deal2-2d.o) \ + $(lib-lac.o) \ + $(lib-base.o) + # check whether we use debug mode or not ifeq ($(debug-mode),on) 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 a3e05a8b1a..eb69a945e5 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 @@ -51,8 +51,14 @@ h-files = $(filter-out *%, $(shell echo *.h)) lib-h-files = $(filter-out *%, $(shell echo ../../include/*.h)) # list of libraries needed to link with -libs = ./Obj.a -ldeal_II_2d -llac -lbase -libs.g = ./Obj.g.a -ldeal_II_2d.g -llac.g -lbase.g +libs.g = ./Obj.g.a \ + $(lib-deal2-2d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libs = ./Obj.a \ + $(lib-deal2-2d.o) \ + $(lib-lac.o) \ + $(lib-base.o) # check whether we use debug mode or not diff --git a/deal.II/deal.II/Attic/examples/poisson/Makefile b/deal.II/deal.II/Attic/examples/poisson/Makefile index a4901b56f4..313599ef7f 100644 --- a/deal.II/deal.II/Attic/examples/poisson/Makefile +++ b/deal.II/deal.II/Attic/examples/poisson/Makefile @@ -51,8 +51,15 @@ h-files = $(filter-out *%, $(shell echo *.h)) lib-h-files = $(filter-out *%, $(shell echo ../../include/*/*.h)) # list of libraries needed to link with -libs = ./Obj.a -ldeal_II_2d -llac -lbase -libs.g = ./Obj.g.a -ldeal_II_2d.g -llac.g -lbase.g +libs.g = ./Obj.g.a \ + $(lib-deal2-2d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libs = ./Obj.a \ + $(lib-deal2-2d.o) \ + $(lib-lac.o) \ + $(lib-base.o) + # check whether we use debug mode or not diff --git a/deal.II/deal.II/Attic/examples/step-by-step/step-1/Makefile b/deal.II/deal.II/Attic/examples/step-by-step/step-1/Makefile index 8753051799..95ea84a536 100644 --- a/deal.II/deal.II/Attic/examples/step-by-step/step-1/Makefile +++ b/deal.II/deal.II/Attic/examples/step-by-step/step-1/Makefile @@ -8,8 +8,7 @@ target = $(basename $(shell echo step-*.cc)) # All dependencies between files should be updated by the included -# file Makefile.dep if necessary. Object files are compiled into -# the archives ./Obj.a and ./Obj.g.a. By default, the debug version +# file Makefile.dep if necessary. By default, the debug version # is used to link. It you don't like that, change the following # variable to "off" debug-mode = on @@ -28,8 +27,12 @@ include $D/common/Make.global_options # list of libraries needed to link with -libs = -ldeal_II_2d -llac -lbase -libs.g = -ldeal_II_2d.g -llac.g -lbase.g +libs.g = $(lib-deal2-2d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libs = $(lib-deal2-2d.o) \ + $(lib-lac.o) \ + $(lib-base.o) # check whether we use debug mode or not diff --git a/deal.II/deal.II/Attic/examples/step-by-step/step-2/Makefile b/deal.II/deal.II/Attic/examples/step-by-step/step-2/Makefile index ce46c336bd..bdae823424 100644 --- a/deal.II/deal.II/Attic/examples/step-by-step/step-2/Makefile +++ b/deal.II/deal.II/Attic/examples/step-by-step/step-2/Makefile @@ -28,8 +28,12 @@ include $D/common/Make.global_options # list of libraries needed to link with -libs = -ldeal_II_2d -llac -lbase -libs.g = -ldeal_II_2d.g -llac.g -lbase.g +libs.g = $(lib-deal2-2d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libs = $(lib-deal2-2d.o) \ + $(lib-lac.o) \ + $(lib-base.o) # check whether we use debug mode or not diff --git a/deal.II/deal.II/Attic/examples/step-by-step/step-3/Makefile b/deal.II/deal.II/Attic/examples/step-by-step/step-3/Makefile index 8753051799..be82c25ebd 100644 --- a/deal.II/deal.II/Attic/examples/step-by-step/step-3/Makefile +++ b/deal.II/deal.II/Attic/examples/step-by-step/step-3/Makefile @@ -28,8 +28,12 @@ include $D/common/Make.global_options # list of libraries needed to link with -libs = -ldeal_II_2d -llac -lbase -libs.g = -ldeal_II_2d.g -llac.g -lbase.g +libs.g = $(lib-deal2-2d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libs = $(lib-deal2-2d.o) \ + $(lib-lac.o) \ + $(lib-base.o) # check whether we use debug mode or not diff --git a/deal.II/deal.II/Attic/examples/step-by-step/step-4/Makefile b/deal.II/deal.II/Attic/examples/step-by-step/step-4/Makefile index 110ec250eb..c2a1f0cbde 100644 --- a/deal.II/deal.II/Attic/examples/step-by-step/step-4/Makefile +++ b/deal.II/deal.II/Attic/examples/step-by-step/step-4/Makefile @@ -29,8 +29,14 @@ include $D/common/Make.global_options # list of libraries needed to link with. this example needs the 3d # part as well -libs.o = -ldeal_II_2d -ldeal_II_2d -llac -lbase -libs.g = -ldeal_II_2d.g -ldeal_II_3d.g -llac.g -lbase.g +libs.g = $(lib-deal2-2d.g) \ + $(lib-deal2-3d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libs.o = $(lib-deal2-2d.o) \ + $(lib-deal2-3d.o) \ + $(lib-lac.o) \ + $(lib-base.o) # check whether we use debug mode or not diff --git a/deal.II/deal.II/Attic/examples/step-by-step/step-5/Makefile b/deal.II/deal.II/Attic/examples/step-by-step/step-5/Makefile index 8753051799..be82c25ebd 100644 --- a/deal.II/deal.II/Attic/examples/step-by-step/step-5/Makefile +++ b/deal.II/deal.II/Attic/examples/step-by-step/step-5/Makefile @@ -28,8 +28,12 @@ include $D/common/Make.global_options # list of libraries needed to link with -libs = -ldeal_II_2d -llac -lbase -libs.g = -ldeal_II_2d.g -llac.g -lbase.g +libs.g = $(lib-deal2-2d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libs = $(lib-deal2-2d.o) \ + $(lib-lac.o) \ + $(lib-base.o) # check whether we use debug mode or not diff --git a/deal.II/deal.II/Attic/examples/step-by-step/step-6/Makefile b/deal.II/deal.II/Attic/examples/step-by-step/step-6/Makefile index 8753051799..be82c25ebd 100644 --- a/deal.II/deal.II/Attic/examples/step-by-step/step-6/Makefile +++ b/deal.II/deal.II/Attic/examples/step-by-step/step-6/Makefile @@ -28,8 +28,12 @@ include $D/common/Make.global_options # list of libraries needed to link with -libs = -ldeal_II_2d -llac -lbase -libs.g = -ldeal_II_2d.g -llac.g -lbase.g +libs.g = $(lib-deal2-2d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libs = $(lib-deal2-2d.o) \ + $(lib-lac.o) \ + $(lib-base.o) # check whether we use debug mode or not diff --git a/deal.II/deal.II/Attic/examples/step-by-step/step-8/Makefile b/deal.II/deal.II/Attic/examples/step-by-step/step-8/Makefile index 8753051799..be82c25ebd 100644 --- a/deal.II/deal.II/Attic/examples/step-by-step/step-8/Makefile +++ b/deal.II/deal.II/Attic/examples/step-by-step/step-8/Makefile @@ -28,8 +28,12 @@ include $D/common/Make.global_options # list of libraries needed to link with -libs = -ldeal_II_2d -llac -lbase -libs.g = -ldeal_II_2d.g -llac.g -lbase.g +libs.g = $(lib-deal2-2d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libs = $(lib-deal2-2d.o) \ + $(lib-lac.o) \ + $(lib-base.o) # check whether we use debug mode or not diff --git a/deal.II/examples/step-1/Makefile b/deal.II/examples/step-1/Makefile index 8753051799..95ea84a536 100644 --- a/deal.II/examples/step-1/Makefile +++ b/deal.II/examples/step-1/Makefile @@ -8,8 +8,7 @@ target = $(basename $(shell echo step-*.cc)) # All dependencies between files should be updated by the included -# file Makefile.dep if necessary. Object files are compiled into -# the archives ./Obj.a and ./Obj.g.a. By default, the debug version +# file Makefile.dep if necessary. By default, the debug version # is used to link. It you don't like that, change the following # variable to "off" debug-mode = on @@ -28,8 +27,12 @@ include $D/common/Make.global_options # list of libraries needed to link with -libs = -ldeal_II_2d -llac -lbase -libs.g = -ldeal_II_2d.g -llac.g -lbase.g +libs.g = $(lib-deal2-2d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libs = $(lib-deal2-2d.o) \ + $(lib-lac.o) \ + $(lib-base.o) # check whether we use debug mode or not diff --git a/deal.II/examples/step-2/Makefile b/deal.II/examples/step-2/Makefile index ce46c336bd..bdae823424 100644 --- a/deal.II/examples/step-2/Makefile +++ b/deal.II/examples/step-2/Makefile @@ -28,8 +28,12 @@ include $D/common/Make.global_options # list of libraries needed to link with -libs = -ldeal_II_2d -llac -lbase -libs.g = -ldeal_II_2d.g -llac.g -lbase.g +libs.g = $(lib-deal2-2d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libs = $(lib-deal2-2d.o) \ + $(lib-lac.o) \ + $(lib-base.o) # check whether we use debug mode or not diff --git a/deal.II/examples/step-3/Makefile b/deal.II/examples/step-3/Makefile index 8753051799..be82c25ebd 100644 --- a/deal.II/examples/step-3/Makefile +++ b/deal.II/examples/step-3/Makefile @@ -28,8 +28,12 @@ include $D/common/Make.global_options # list of libraries needed to link with -libs = -ldeal_II_2d -llac -lbase -libs.g = -ldeal_II_2d.g -llac.g -lbase.g +libs.g = $(lib-deal2-2d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libs = $(lib-deal2-2d.o) \ + $(lib-lac.o) \ + $(lib-base.o) # check whether we use debug mode or not diff --git a/deal.II/examples/step-4/Makefile b/deal.II/examples/step-4/Makefile index 110ec250eb..c2a1f0cbde 100644 --- a/deal.II/examples/step-4/Makefile +++ b/deal.II/examples/step-4/Makefile @@ -29,8 +29,14 @@ include $D/common/Make.global_options # list of libraries needed to link with. this example needs the 3d # part as well -libs.o = -ldeal_II_2d -ldeal_II_2d -llac -lbase -libs.g = -ldeal_II_2d.g -ldeal_II_3d.g -llac.g -lbase.g +libs.g = $(lib-deal2-2d.g) \ + $(lib-deal2-3d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libs.o = $(lib-deal2-2d.o) \ + $(lib-deal2-3d.o) \ + $(lib-lac.o) \ + $(lib-base.o) # check whether we use debug mode or not diff --git a/deal.II/examples/step-5/Makefile b/deal.II/examples/step-5/Makefile index 8753051799..be82c25ebd 100644 --- a/deal.II/examples/step-5/Makefile +++ b/deal.II/examples/step-5/Makefile @@ -28,8 +28,12 @@ include $D/common/Make.global_options # list of libraries needed to link with -libs = -ldeal_II_2d -llac -lbase -libs.g = -ldeal_II_2d.g -llac.g -lbase.g +libs.g = $(lib-deal2-2d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libs = $(lib-deal2-2d.o) \ + $(lib-lac.o) \ + $(lib-base.o) # check whether we use debug mode or not diff --git a/deal.II/examples/step-6/Makefile b/deal.II/examples/step-6/Makefile index 8753051799..be82c25ebd 100644 --- a/deal.II/examples/step-6/Makefile +++ b/deal.II/examples/step-6/Makefile @@ -28,8 +28,12 @@ include $D/common/Make.global_options # list of libraries needed to link with -libs = -ldeal_II_2d -llac -lbase -libs.g = -ldeal_II_2d.g -llac.g -lbase.g +libs.g = $(lib-deal2-2d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libs = $(lib-deal2-2d.o) \ + $(lib-lac.o) \ + $(lib-base.o) # check whether we use debug mode or not diff --git a/deal.II/examples/step-8/Makefile b/deal.II/examples/step-8/Makefile index 8753051799..be82c25ebd 100644 --- a/deal.II/examples/step-8/Makefile +++ b/deal.II/examples/step-8/Makefile @@ -28,8 +28,12 @@ include $D/common/Make.global_options # list of libraries needed to link with -libs = -ldeal_II_2d -llac -lbase -libs.g = -ldeal_II_2d.g -llac.g -lbase.g +libs.g = $(lib-deal2-2d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libs = $(lib-deal2-2d.o) \ + $(lib-lac.o) \ + $(lib-base.o) # check whether we use debug mode or not diff --git a/tests/big-tests/convergence/Makefile b/tests/big-tests/convergence/Makefile index 2cbefdbd72..dae78cbddb 100644 --- a/tests/big-tests/convergence/Makefile +++ b/tests/big-tests/convergence/Makefile @@ -49,8 +49,14 @@ h-files = $(filter-out *%, $(shell echo *.h)) lib-h-files = $(filter-out *%, $(shell echo ../../include/*/*.h)) # list of libraries needed to link with -libs = ./Obj.a -ldeal_II_2d -llac -lbase -libs.g = ./Obj.g.a -ldeal_II_2d.g -llac.g -lbase.g +libs.g = ./Obj.g.a \ + $(lib-deal2-2d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libs = ./Obj.a \ + $(lib-deal2-2d.o) \ + $(lib-lac.o) \ + $(lib-base.o) # check whether we use debug mode or not diff --git a/tests/big-tests/dof/Makefile b/tests/big-tests/dof/Makefile index 46b8df97c3..82401e23ed 100644 --- a/tests/big-tests/dof/Makefile +++ b/tests/big-tests/dof/Makefile @@ -50,8 +50,16 @@ h-files = $(filter-out *%, $(shell echo *.h)) lib-h-files = $(filter-out *%, $(shell echo ../../include/*/*.h)) # list of libraries needed to link with -libs = ./Obj.a ../../lib/libdeal_II_2d.a ../../lib/libdeal_II_3d.a ../../../lac/lib/liblac.a ../../../base/lib/libbase.a -libs.g = ./Obj.g.a ../../lib/libdeal_II_2d.g.a ../../lib/libdeal_II_3d.g.a ../../../lac/lib/liblac.g.a ../../../base/lib/libbase.g.a ../../../base/lib/libbase.g.a +libs.g = ./Obj.g.a \ + $(lib-deal2-2d.g) \ + $(lib-deal2-3d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libs = ./Obj.a \ + $(lib-deal2-2d.o) \ + $(lib-deal2-3d.o) \ + $(lib-lac.o) \ + $(lib-base.o) # check whether we use debug mode or not diff --git a/tests/big-tests/error-estimation/Makefile b/tests/big-tests/error-estimation/Makefile index 180aa8b7a3..ce492a697e 100644 --- a/tests/big-tests/error-estimation/Makefile +++ b/tests/big-tests/error-estimation/Makefile @@ -55,8 +55,14 @@ h-files = $(filter-out *%, $(shell echo *.h)) lib-h-files = $(filter-out *%, $(shell echo ../../include/*/*.h)) # list of libraries needed to link with -libs = ./Obj.a -ldeal_II_2d -llac -lbase -libs.g = ./Obj.g.a -ldeal_II_2d.g -llac.g -lbase.g +libs.g = ./Obj.g.a \ + $(lib-deal2-2d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libs = ./Obj.a \ + $(lib-deal2-2d.o) \ + $(lib-lac.o) \ + $(lib-base.o) # check whether we use debug mode or not ifeq ($(debug-mode),on) diff --git a/tests/big-tests/grid/Makefile b/tests/big-tests/grid/Makefile index 1be0febb07..d6edea4a30 100644 --- a/tests/big-tests/grid/Makefile +++ b/tests/big-tests/grid/Makefile @@ -50,8 +50,16 @@ h-files = $(filter-out *%, $(shell echo *.h)) lib-h-files = $(filter-out *%, $(shell echo ../../include/*/*.h)) # list of libraries needed to link with -libs = ./Obj.a ../../lib/libdeal_II_2d.g.a ../../lib/libdeal_II_3d.a ../../../lac/lib/liblac.a ../../../base/lib/libbase.a -libs.g = ./Obj.g.a ../../lib/libdeal_II_2d.g.a ../../lib/libdeal_II_3d.g.a ../../../lac/lib/liblac.g.a ../../../base/lib/libbase.g.a +libs.g = ./Obj.g.a \ + $(lib-deal2-2d.g) \ + $(lib-deal2-3d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libs = ./Obj.a \ + $(lib-deal2-2d.o) \ + $(lib-deal2-3d.o) \ + $(lib-lac.o) \ + $(lib-base.o) # check whether we use debug mode or not diff --git a/tests/big-tests/multigrid/Makefile b/tests/big-tests/multigrid/Makefile index 63557adbdc..f5d4be0a4b 100644 --- a/tests/big-tests/multigrid/Makefile +++ b/tests/big-tests/multigrid/Makefile @@ -50,8 +50,15 @@ h-files = $(filter-out *%, $(shell echo *.h)) lib-h-files = $(filter-out *%, $(shell echo ../../include/*/*.h)) # list of libraries needed to link with -libs = ./Obj.a -ldeal_II_2d -llac -lbase -libs.g = ./Obj.g.a -ldeal_II_2d.g -llac.g -lbase.g +libs.g = ./Obj.g.a \ + $(lib-deal2-2d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libs = ./Obj.a \ + $(lib-deal2-2d.o) \ + $(lib-lac.o) \ + $(lib-base.o) + # check whether we use debug mode or not ifeq ($(debug-mode),on) diff --git a/tests/big-tests/nonlinear/fixed-point-iteration/Makefile b/tests/big-tests/nonlinear/fixed-point-iteration/Makefile index a3e05a8b1a..eb69a945e5 100644 --- a/tests/big-tests/nonlinear/fixed-point-iteration/Makefile +++ b/tests/big-tests/nonlinear/fixed-point-iteration/Makefile @@ -51,8 +51,14 @@ h-files = $(filter-out *%, $(shell echo *.h)) lib-h-files = $(filter-out *%, $(shell echo ../../include/*.h)) # list of libraries needed to link with -libs = ./Obj.a -ldeal_II_2d -llac -lbase -libs.g = ./Obj.g.a -ldeal_II_2d.g -llac.g -lbase.g +libs.g = ./Obj.g.a \ + $(lib-deal2-2d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libs = ./Obj.a \ + $(lib-deal2-2d.o) \ + $(lib-lac.o) \ + $(lib-base.o) # check whether we use debug mode or not diff --git a/tests/big-tests/poisson/Makefile b/tests/big-tests/poisson/Makefile index a4901b56f4..313599ef7f 100644 --- a/tests/big-tests/poisson/Makefile +++ b/tests/big-tests/poisson/Makefile @@ -51,8 +51,15 @@ h-files = $(filter-out *%, $(shell echo *.h)) lib-h-files = $(filter-out *%, $(shell echo ../../include/*/*.h)) # list of libraries needed to link with -libs = ./Obj.a -ldeal_II_2d -llac -lbase -libs.g = ./Obj.g.a -ldeal_II_2d.g -llac.g -lbase.g +libs.g = ./Obj.g.a \ + $(lib-deal2-2d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libs = ./Obj.a \ + $(lib-deal2-2d.o) \ + $(lib-lac.o) \ + $(lib-base.o) + # check whether we use debug mode or not -- 2.39.5