]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Makefiles improved by $^
authorguido <guido@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 8 Sep 1998 16:25:18 +0000 (16:25 +0000)
committerguido <guido@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 8 Sep 1998 16:25:18 +0000 (16:25 +0000)
Adjustment to new PrimitiveVectorMemory

git-svn-id: https://svn.dealii.org/trunk@592 0785d39b-7218-0410-832d-ea1e28bc413d

13 files changed:
deal.II/deal.II/Attic/examples/convergence/Makefile
deal.II/deal.II/Attic/examples/error-estimation/Makefile
deal.II/deal.II/Attic/examples/multigrid/Makefile
deal.II/deal.II/Attic/examples/multigrid/multigrid.cc
deal.II/deal.II/Attic/examples/poisson/Makefile
deal.II/deal.II/Make.global_options
deal.II/deal.II/source/numerics/base.cc
deal.II/deal.II/source/numerics/vectors.cc
tests/big-tests/convergence/Makefile
tests/big-tests/error-estimation/Makefile
tests/big-tests/multigrid/Makefile
tests/big-tests/multigrid/multigrid.cc
tests/big-tests/poisson/Makefile

index e982c1256773aa4ad99b8ca75cbaaf59d1a4271d..eac73ec72930bd0cf8d098be6a4879972dd13081 100644 (file)
@@ -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)
index 9551e88f5ab23644bac73e3115382f199a88284c..8e4a14ea44f7e68d47418a7765fdaa9e21befe08 100644 (file)
@@ -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)
index cad3118764137507e1582d7c4e3537fcdd9b94ba..da450e161a9f6a3469717af5e4d6b5efb82aa45f 100644 (file)
@@ -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)
index e5e252f8762b8f77dff231e519516dd4c95f9075..7d602803e82ecca19cb6cde7a6b5fcfd0b844570 100644 (file)
@@ -385,7 +385,7 @@ void PoissonProblem<dim>::solve () {
   Assert ((tria!=0) && (dof!=0), ExcNoTriaSelected());
   
   SolverControl                    control(4000, 1e-16);
-  PrimitiveVectorMemory<dVector>   memory(right_hand_side.size());
+  PrimitiveVectorMemory<dVector>   memory;
   SolverCG<dSMatrix,dVector>       cg(control,memory);
 
                                   // solve
index ec4388a4f2dc1530c88cde01c1ce935b5f688618..4e622ce5bf6f2b63834e2da7f85609d2e48a2722 100644 (file)
@@ -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)
index dd7cdcb03c165e6e8d21f44d051c36125854f920..62a222aa300cd81a42d91d4956f15fcbd8b12d04 100644 (file)
@@ -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 \
index 843e555285a81c62f52e0e327d6e9e3cd9d28905..d9335a4bb9130fda0a0ce307709862c14990b454 100644 (file)
@@ -136,7 +136,7 @@ void ProblemBase<dim>::solve () {
   Assert ((tria!=0) && (dof_handler!=0), ExcNoTriaSelected());
   
   SolverControl                    control(4000, 1e-16);
-  PrimitiveVectorMemory<dVector>   memory(right_hand_side.size());
+  PrimitiveVectorMemory<dVector>   memory;
   SolverCG<dSMatrix,dVector>       cg(control,memory);
 
                                   // solve
index cbf7b4246d6cab7df5b6dd1d8cfa9fe05602d647..d59d097e2add773902be7813b460d15c84018060 100644 (file)
@@ -177,7 +177,7 @@ void VectorTools<dim>::project (const DoFHandler<dim>    &dof,
                                           mass_matrix, vec, tmp);
 
   SolverControl                    control(1000,1e-16);
-  PrimitiveVectorMemory<dVector>   memory(tmp.size());
+  PrimitiveVectorMemory<dVector>   memory;
   SolverCG<dSMatrix,dVector>       cg(control,memory);
 
                                   // solve
@@ -331,7 +331,7 @@ VectorTools<dim>::project_boundary_values (const DoFHandler<dim>    &dof,
   dVector boundary_projection (rhs.size());
 
   SolverControl                    control(1000, 1e-16);
-  PrimitiveVectorMemory<dVector>   memory(rhs.size());
+  PrimitiveVectorMemory<dVector>   memory;
   SolverCG<dSMatrix,dVector>       cg(control,memory);
 
                                   // solve
index e982c1256773aa4ad99b8ca75cbaaf59d1a4271d..eac73ec72930bd0cf8d098be6a4879972dd13081 100644 (file)
@@ -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)
index 9551e88f5ab23644bac73e3115382f199a88284c..8e4a14ea44f7e68d47418a7765fdaa9e21befe08 100644 (file)
@@ -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)
index cad3118764137507e1582d7c4e3537fcdd9b94ba..da450e161a9f6a3469717af5e4d6b5efb82aa45f 100644 (file)
@@ -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)
index e5e252f8762b8f77dff231e519516dd4c95f9075..7d602803e82ecca19cb6cde7a6b5fcfd0b844570 100644 (file)
@@ -385,7 +385,7 @@ void PoissonProblem<dim>::solve () {
   Assert ((tria!=0) && (dof!=0), ExcNoTriaSelected());
   
   SolverControl                    control(4000, 1e-16);
-  PrimitiveVectorMemory<dVector>   memory(right_hand_side.size());
+  PrimitiveVectorMemory<dVector>   memory;
   SolverCG<dSMatrix,dVector>       cg(control,memory);
 
                                   // solve
index ec4388a4f2dc1530c88cde01c1ce935b5f688618..4e622ce5bf6f2b63834e2da7f85609d2e48a2722 100644 (file)
@@ -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)

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.