From bf71618861fd45757b38ec398851f382c37d9b24 Mon Sep 17 00:00:00 2001 From: guido Date: Tue, 8 Sep 1998 16:25:18 +0000 Subject: [PATCH] Makefiles improved by $^ Adjustment to new PrimitiveVectorMemory git-svn-id: https://svn.dealii.org/trunk@592 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/Attic/examples/convergence/Makefile | 11 +++++------ .../Attic/examples/error-estimation/Makefile | 13 ++++++------- deal.II/deal.II/Attic/examples/multigrid/Makefile | 13 ++++++------- .../deal.II/Attic/examples/multigrid/multigrid.cc | 2 +- deal.II/deal.II/Attic/examples/poisson/Makefile | 11 ++++++----- deal.II/deal.II/Make.global_options | 6 +++--- deal.II/deal.II/source/numerics/base.cc | 2 +- deal.II/deal.II/source/numerics/vectors.cc | 4 ++-- tests/big-tests/convergence/Makefile | 11 +++++------ tests/big-tests/error-estimation/Makefile | 13 ++++++------- tests/big-tests/multigrid/Makefile | 13 ++++++------- tests/big-tests/multigrid/multigrid.cc | 2 +- tests/big-tests/poisson/Makefile | 11 ++++++----- 13 files changed, 54 insertions(+), 58 deletions(-) diff --git a/deal.II/deal.II/Attic/examples/convergence/Makefile b/deal.II/deal.II/Attic/examples/convergence/Makefile index e982c12567..eac73ec729 100644 --- a/deal.II/deal.II/Attic/examples/convergence/Makefile +++ b/deal.II/deal.II/Attic/examples/convergence/Makefile @@ -36,12 +36,11 @@ delete-files = *gnuplot *.eps *ucd *history ############################################################################### # Internals -include ../../Make.global_options - - #deal include base path D = ../../.. +include ../../Make.global_options + # get lists of files we need cc-files = $(wildcard *.cc) o-files = $(cc-files:.cc=.o) @@ -50,8 +49,8 @@ h-files = $(wildcard *.h) lib-h-files = $(wildcard ../../include/*/*.h) # list of libraries needed to link with -libs = ./Obj.a ../../lib/libdeal_II.a ../../../lac/lib/liblac.a -libs.g = ./Obj.g.a ../../lib/libdeal_II.g.a ../../../lac/lib/liblac.g.a +libs = ./Obj.a -ldeal_II -llac -lbase +libs.g = ./Obj.g.a -ldeal_II.g -llac.g -lbase.g # check whether we use debug mode or not @@ -70,7 +69,7 @@ endif # make rule for the target $(target) : $(libraries) @echo ============================ Linking $@ - @$(CXX) $(flags) -o $@ $(libraries) $(user-libs) + @$(CXX) $(flags) -o $@ $^ $(user-libs) # rule how to run the program run: $(target) diff --git a/deal.II/deal.II/Attic/examples/error-estimation/Makefile b/deal.II/deal.II/Attic/examples/error-estimation/Makefile index 9551e88f5a..8e4a14ea44 100644 --- a/deal.II/deal.II/Attic/examples/error-estimation/Makefile +++ b/deal.II/deal.II/Attic/examples/error-estimation/Makefile @@ -41,12 +41,12 @@ delete-files = data-*/* ############################################################################### # Internals -include ../../Make.global_options - - #deal include base path D = ../../.. +include ../../Make.global_options + + # get lists of files we need cc-files = $(wildcard *.cc) o-files = $(cc-files:.cc=.o) @@ -55,9 +55,8 @@ h-files = $(wildcard *.h) lib-h-files = $(wildcard ../../include/*/*.h) # list of libraries needed to link with -libs = ./Obj.a ../../lib/libdeal_II.a ../../../lac/lib/liblac.a -libs.g = ./Obj.g.a ../../lib/libdeal_II.g.a ../../../lac/lib/liblac.g.a - +libs = ./Obj.a -ldeal_II -llac -lbase +libs.g = ./Obj.g.a -ldeal_II.g -llac.g -lbase.g # check whether we use debug mode or not ifeq ($(debug-mode),on) @@ -75,7 +74,7 @@ endif # make rule for the target $(target) : $(libraries) @echo ============================ Linking $@ - @$(CXX) $(flags) -o $@ $(libraries) $(user-libs) + @$(CXX) $(flags) -o $@ $^ $(user-libs) run: $(target) $(run-action) diff --git a/deal.II/deal.II/Attic/examples/multigrid/Makefile b/deal.II/deal.II/Attic/examples/multigrid/Makefile index cad3118764..da450e161a 100644 --- a/deal.II/deal.II/Attic/examples/multigrid/Makefile +++ b/deal.II/deal.II/Attic/examples/multigrid/Makefile @@ -36,12 +36,12 @@ delete-files = *gnuplot *.eps *ucd *history ############################################################################### # Internals -include ../../Make.global_options - - #deal include base path D = ../../.. +include ../../Make.global_options + + # get lists of files we need cc-files = $(wildcard *.cc) o-files = $(cc-files:.cc=.o) @@ -50,9 +50,8 @@ h-files = $(wildcard *.h) lib-h-files = $(wildcard ../../include/*/*.h) # list of libraries needed to link with -libs = ./Obj.a ../../lib/libdeal_II.a ../../../lac/lib/liblac.a -libs.g = ./Obj.g.a ../../lib/libdeal_II.g.a ../../../lac/lib/liblac.g.a - +libs = ./Obj.a -ldeal_II -llac -lbase +libs.g = ./Obj.g.a -ldeal_II.g -llac.g -lbase.g # check whether we use debug mode or not ifeq ($(debug-mode),on) @@ -70,7 +69,7 @@ endif # make rule for the target $(target) : $(libraries) @echo ============================ Linking $@ - @$(CXX) $(flags) -o $@ $(libraries) $(user-libs) + @$(CXX) $(flags) -o $@ $^ $(user-libs) # rule how to run the program run: $(target) diff --git a/deal.II/deal.II/Attic/examples/multigrid/multigrid.cc b/deal.II/deal.II/Attic/examples/multigrid/multigrid.cc index e5e252f876..7d602803e8 100644 --- a/deal.II/deal.II/Attic/examples/multigrid/multigrid.cc +++ b/deal.II/deal.II/Attic/examples/multigrid/multigrid.cc @@ -385,7 +385,7 @@ void PoissonProblem::solve () { Assert ((tria!=0) && (dof!=0), ExcNoTriaSelected()); SolverControl control(4000, 1e-16); - PrimitiveVectorMemory memory(right_hand_side.size()); + PrimitiveVectorMemory memory; SolverCG cg(control,memory); // solve diff --git a/deal.II/deal.II/Attic/examples/poisson/Makefile b/deal.II/deal.II/Attic/examples/poisson/Makefile index ec4388a4f2..4e622ce5bf 100644 --- a/deal.II/deal.II/Attic/examples/poisson/Makefile +++ b/deal.II/deal.II/Attic/examples/poisson/Makefile @@ -36,11 +36,12 @@ delete-files = gnuplot* *.eps ############################################################################### # Internals +#deal include base path +D = ../../.. + include ../../Make.global_options -#deal include base path -D = ../../.. # get lists of files we need cc-files = $(wildcard *.cc) @@ -50,8 +51,8 @@ h-files = $(wildcard *.h) lib-h-files = $(wildcard ../../include/*/*.h) # list of libraries needed to link with -libs = ./Obj.a ../../lib/libdeal_II.a ../../../lac/lib/liblac.a -libs.g = ./Obj.g.a ../../lib/libdeal_II.g.a ../../../lac/lib/liblac.g.a +libs = ./Obj.a -ldeal_II -llac -lbase +libs.g = ./Obj.g.a -ldeal_II.g lac.g -lbase.g # check whether we use debug mode or not @@ -70,7 +71,7 @@ endif # make rule for the target $(target) : $(libraries) @echo ============================ Linking $@ - @$(CXX) $(flags) -o $@ $(libraries) $(user-libs) + @$(CXX) $(flags) -o $@ $^ $(user-libs) # rule how to run the program run: $(target) diff --git a/deal.II/deal.II/Make.global_options b/deal.II/deal.II/Make.global_options index dd7cdcb03c..62a222aa30 100644 --- a/deal.II/deal.II/Make.global_options +++ b/deal.II/deal.II/Make.global_options @@ -11,9 +11,9 @@ deal_II_dimension=2 -vpath %.a: $D/base/lib -vpath %.a: $D/lac/lib -vpath %.a: $D/deal.II/lib +vpath %.a $D/base/lib +vpath %.a $D/lac/lib +vpath %.a $D/deal.II/lib CXX = c++ INCLUDE = -I$D/deal.II/include -I$D/lac/include \ diff --git a/deal.II/deal.II/source/numerics/base.cc b/deal.II/deal.II/source/numerics/base.cc index 843e555285..d9335a4bb9 100644 --- a/deal.II/deal.II/source/numerics/base.cc +++ b/deal.II/deal.II/source/numerics/base.cc @@ -136,7 +136,7 @@ void ProblemBase::solve () { Assert ((tria!=0) && (dof_handler!=0), ExcNoTriaSelected()); SolverControl control(4000, 1e-16); - PrimitiveVectorMemory memory(right_hand_side.size()); + PrimitiveVectorMemory memory; SolverCG cg(control,memory); // solve diff --git a/deal.II/deal.II/source/numerics/vectors.cc b/deal.II/deal.II/source/numerics/vectors.cc index cbf7b4246d..d59d097e2a 100644 --- a/deal.II/deal.II/source/numerics/vectors.cc +++ b/deal.II/deal.II/source/numerics/vectors.cc @@ -177,7 +177,7 @@ void VectorTools::project (const DoFHandler &dof, mass_matrix, vec, tmp); SolverControl control(1000,1e-16); - PrimitiveVectorMemory memory(tmp.size()); + PrimitiveVectorMemory memory; SolverCG cg(control,memory); // solve @@ -331,7 +331,7 @@ VectorTools::project_boundary_values (const DoFHandler &dof, dVector boundary_projection (rhs.size()); SolverControl control(1000, 1e-16); - PrimitiveVectorMemory memory(rhs.size()); + PrimitiveVectorMemory memory; SolverCG cg(control,memory); // solve diff --git a/tests/big-tests/convergence/Makefile b/tests/big-tests/convergence/Makefile index e982c12567..eac73ec729 100644 --- a/tests/big-tests/convergence/Makefile +++ b/tests/big-tests/convergence/Makefile @@ -36,12 +36,11 @@ delete-files = *gnuplot *.eps *ucd *history ############################################################################### # Internals -include ../../Make.global_options - - #deal include base path D = ../../.. +include ../../Make.global_options + # get lists of files we need cc-files = $(wildcard *.cc) o-files = $(cc-files:.cc=.o) @@ -50,8 +49,8 @@ h-files = $(wildcard *.h) lib-h-files = $(wildcard ../../include/*/*.h) # list of libraries needed to link with -libs = ./Obj.a ../../lib/libdeal_II.a ../../../lac/lib/liblac.a -libs.g = ./Obj.g.a ../../lib/libdeal_II.g.a ../../../lac/lib/liblac.g.a +libs = ./Obj.a -ldeal_II -llac -lbase +libs.g = ./Obj.g.a -ldeal_II.g -llac.g -lbase.g # check whether we use debug mode or not @@ -70,7 +69,7 @@ endif # make rule for the target $(target) : $(libraries) @echo ============================ Linking $@ - @$(CXX) $(flags) -o $@ $(libraries) $(user-libs) + @$(CXX) $(flags) -o $@ $^ $(user-libs) # rule how to run the program run: $(target) diff --git a/tests/big-tests/error-estimation/Makefile b/tests/big-tests/error-estimation/Makefile index 9551e88f5a..8e4a14ea44 100644 --- a/tests/big-tests/error-estimation/Makefile +++ b/tests/big-tests/error-estimation/Makefile @@ -41,12 +41,12 @@ delete-files = data-*/* ############################################################################### # Internals -include ../../Make.global_options - - #deal include base path D = ../../.. +include ../../Make.global_options + + # get lists of files we need cc-files = $(wildcard *.cc) o-files = $(cc-files:.cc=.o) @@ -55,9 +55,8 @@ h-files = $(wildcard *.h) lib-h-files = $(wildcard ../../include/*/*.h) # list of libraries needed to link with -libs = ./Obj.a ../../lib/libdeal_II.a ../../../lac/lib/liblac.a -libs.g = ./Obj.g.a ../../lib/libdeal_II.g.a ../../../lac/lib/liblac.g.a - +libs = ./Obj.a -ldeal_II -llac -lbase +libs.g = ./Obj.g.a -ldeal_II.g -llac.g -lbase.g # check whether we use debug mode or not ifeq ($(debug-mode),on) @@ -75,7 +74,7 @@ endif # make rule for the target $(target) : $(libraries) @echo ============================ Linking $@ - @$(CXX) $(flags) -o $@ $(libraries) $(user-libs) + @$(CXX) $(flags) -o $@ $^ $(user-libs) run: $(target) $(run-action) diff --git a/tests/big-tests/multigrid/Makefile b/tests/big-tests/multigrid/Makefile index cad3118764..da450e161a 100644 --- a/tests/big-tests/multigrid/Makefile +++ b/tests/big-tests/multigrid/Makefile @@ -36,12 +36,12 @@ delete-files = *gnuplot *.eps *ucd *history ############################################################################### # Internals -include ../../Make.global_options - - #deal include base path D = ../../.. +include ../../Make.global_options + + # get lists of files we need cc-files = $(wildcard *.cc) o-files = $(cc-files:.cc=.o) @@ -50,9 +50,8 @@ h-files = $(wildcard *.h) lib-h-files = $(wildcard ../../include/*/*.h) # list of libraries needed to link with -libs = ./Obj.a ../../lib/libdeal_II.a ../../../lac/lib/liblac.a -libs.g = ./Obj.g.a ../../lib/libdeal_II.g.a ../../../lac/lib/liblac.g.a - +libs = ./Obj.a -ldeal_II -llac -lbase +libs.g = ./Obj.g.a -ldeal_II.g -llac.g -lbase.g # check whether we use debug mode or not ifeq ($(debug-mode),on) @@ -70,7 +69,7 @@ endif # make rule for the target $(target) : $(libraries) @echo ============================ Linking $@ - @$(CXX) $(flags) -o $@ $(libraries) $(user-libs) + @$(CXX) $(flags) -o $@ $^ $(user-libs) # rule how to run the program run: $(target) diff --git a/tests/big-tests/multigrid/multigrid.cc b/tests/big-tests/multigrid/multigrid.cc index e5e252f876..7d602803e8 100644 --- a/tests/big-tests/multigrid/multigrid.cc +++ b/tests/big-tests/multigrid/multigrid.cc @@ -385,7 +385,7 @@ void PoissonProblem::solve () { Assert ((tria!=0) && (dof!=0), ExcNoTriaSelected()); SolverControl control(4000, 1e-16); - PrimitiveVectorMemory memory(right_hand_side.size()); + PrimitiveVectorMemory memory; SolverCG cg(control,memory); // solve diff --git a/tests/big-tests/poisson/Makefile b/tests/big-tests/poisson/Makefile index ec4388a4f2..4e622ce5bf 100644 --- a/tests/big-tests/poisson/Makefile +++ b/tests/big-tests/poisson/Makefile @@ -36,11 +36,12 @@ delete-files = gnuplot* *.eps ############################################################################### # Internals +#deal include base path +D = ../../.. + include ../../Make.global_options -#deal include base path -D = ../../.. # get lists of files we need cc-files = $(wildcard *.cc) @@ -50,8 +51,8 @@ h-files = $(wildcard *.h) lib-h-files = $(wildcard ../../include/*/*.h) # list of libraries needed to link with -libs = ./Obj.a ../../lib/libdeal_II.a ../../../lac/lib/liblac.a -libs.g = ./Obj.g.a ../../lib/libdeal_II.g.a ../../../lac/lib/liblac.g.a +libs = ./Obj.a -ldeal_II -llac -lbase +libs.g = ./Obj.g.a -ldeal_II.g lac.g -lbase.g # check whether we use debug mode or not @@ -70,7 +71,7 @@ endif # make rule for the target $(target) : $(libraries) @echo ============================ Linking $@ - @$(CXX) $(flags) -o $@ $(libraries) $(user-libs) + @$(CXX) $(flags) -o $@ $^ $(user-libs) # rule how to run the program run: $(target) -- 2.39.5