From e32e6b77453f52727eb1170f4e905347ca27af9d Mon Sep 17 00:00:00 2001 From: guido Date: Tue, 29 Feb 2000 14:22:45 +0000 Subject: [PATCH] configure deal directory git-svn-id: https://svn.dealii.org/trunk@2514 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/big-tests/Makefile | 4 +++- tests/big-tests/convergence/Makefile | 16 ++++++---------- tests/big-tests/dof/Makefile | 16 ++++++---------- tests/big-tests/error-estimation/Makefile | 16 ++++++---------- tests/big-tests/grid/Makefile | 15 ++++++--------- tests/big-tests/multigrid/Makefile | 16 ++++++---------- .../nonlinear/fixed-point-iteration/Makefile | 12 ++++++++---- tests/big-tests/poisson/Makefile | 12 +++++++----- 8 files changed, 48 insertions(+), 59 deletions(-) diff --git a/tests/big-tests/Makefile b/tests/big-tests/Makefile index 3c406115c7..7d505a3c11 100644 --- a/tests/big-tests/Makefile +++ b/tests/big-tests/Makefile @@ -22,10 +22,12 @@ clean : $(clean) # define the action of the targets for the specific subdirectories $(compile) : - cd $(@:.compile=) ; $(MAKE) + cd $(@:.compile=) ; $(MAKE) D=$D $(run) : cd $(@:.run=) ; $(MAKE) run $(clean) : -cd $(@:.clean=) ; $(MAKE) clean + + diff --git a/tests/big-tests/convergence/Makefile b/tests/big-tests/convergence/Makefile index 960504f30f..4815dad0c8 100644 --- a/tests/big-tests/convergence/Makefile +++ b/tests/big-tests/convergence/Makefile @@ -1,5 +1,10 @@ # $Id$ -# Copyright W. Bangerth, University of Heidelberg, 1998, 1999, 2000 +# Copyright by the deal.II authors 1998, 1999, 2000 + +############################################################ +# $D contains the root of the deal distribution and should +# be supplied as a command line argument D=../../... +############################################################ # For the small projects Makefile, you basically need to fill in only @@ -18,15 +23,6 @@ target = convergence debug-mode = on -# As third field, we need to give the path to the top-level deal.II -# directory. You need to adjust this to your needs. Since this path is -# probably the most often needed one in the Makefile internals, it is -# designated by a single-character variable, since that can be -# reference using $D only, i.e. without the parentheses that are -# required for most other parameters, as e.g. in $(target). -D = ../../../deal.II/ - - # The last field specifies the names of data and other files that # shall be deleted when calling `make clean'. Object and backup files, # executables and the like are removed anyway. Here, we give a list of diff --git a/tests/big-tests/dof/Makefile b/tests/big-tests/dof/Makefile index 9285e3f937..dd72340acf 100644 --- a/tests/big-tests/dof/Makefile +++ b/tests/big-tests/dof/Makefile @@ -1,5 +1,10 @@ # $Id$ -# Copyright W. Bangerth, University of Heidelberg, 1998, 1999, 2000 +# Copyright by the deal.II authors 1998, 1999, 2000 + +############################################################ +# $D contains the root of the deal distribution and should +# be supplied as a command line argument D=../../... +############################################################ # For the small projects Makefile, you basically need to fill in only @@ -18,15 +23,6 @@ target = dof_test debug-mode = on -# As third field, we need to give the path to the top-level deal.II -# directory. You need to adjust this to your needs. Since this path is -# probably the most often needed one in the Makefile internals, it is -# designated by a single-character variable, since that can be -# reference using $D only, i.e. without the parentheses that are -# required for most other parameters, as e.g. in $(target). -D = ../../../deal.II/ - - # The last field specifies the names of data and other files that # shall be deleted when calling `make clean'. Object and backup files, # executables and the like are removed anyway. Here, we give a list of diff --git a/tests/big-tests/error-estimation/Makefile b/tests/big-tests/error-estimation/Makefile index c444e5123d..f9fa647c68 100644 --- a/tests/big-tests/error-estimation/Makefile +++ b/tests/big-tests/error-estimation/Makefile @@ -1,5 +1,10 @@ # $Id$ -# Copyright W. Bangerth, University of Heidelberg, 1998, 1999, 2000 +# Copyright by the deal.II authors 1998, 1999, 2000 + +############################################################ +# $D contains the root of the deal distribution and should +# be supplied as a command line argument D=../../... +############################################################ # For the small projects Makefile, you basically need to fill in only @@ -18,15 +23,6 @@ target = error-estimation debug-mode = on -# As third field, we need to give the path to the top-level deal.II -# directory. You need to adjust this to your needs. Since this path is -# probably the most often needed one in the Makefile internals, it is -# designated by a single-character variable, since that can be -# reference using $D only, i.e. without the parentheses that are -# required for most other parameters, as e.g. in $(target). -D = ../../../deal.II/ - - # The last field specifies the names of data and other files that # shall be deleted when calling `make clean'. Object and backup files, # executables and the like are removed anyway. Here, we give a list of diff --git a/tests/big-tests/grid/Makefile b/tests/big-tests/grid/Makefile index 8b24137106..e4480a990d 100644 --- a/tests/big-tests/grid/Makefile +++ b/tests/big-tests/grid/Makefile @@ -1,5 +1,10 @@ # $Id$ -# Copyright W. Bangerth, University of Heidelberg, 1998, 1999, 2000 +# Copyright by the deal.II authors 1998, 1999, 2000 + +############################################################ +# $D contains the root of the deal distribution and should +# be supplied as a command line argument D=../../... +############################################################ # For the small projects Makefile, you basically need to fill in only @@ -18,14 +23,6 @@ target = grid_test debug-mode = on -# As third field, we need to give the path to the top-level deal.II -# directory. You need to adjust this to your needs. Since this path is -# probably the most often needed one in the Makefile internals, it is -# designated by a single-character variable, since that can be -# reference using $D only, i.e. without the parentheses that are -# required for most other parameters, as e.g. in $(target). -D = ../../../deal.II/ - # The last field specifies the names of data and other files that # shall be deleted when calling `make clean'. Object and backup files, diff --git a/tests/big-tests/multigrid/Makefile b/tests/big-tests/multigrid/Makefile index 5a0d33203f..bc775f2f7d 100644 --- a/tests/big-tests/multigrid/Makefile +++ b/tests/big-tests/multigrid/Makefile @@ -1,5 +1,10 @@ # $Id$ -# Copyright W. Bangerth, University of Heidelberg, 1998, 1999, 2000 +# Copyright by the deal.II authors 1998, 1999, 2000 + +############################################################ +# $D contains the root of the deal distribution and should +# be supplied as a command line argument D=../../... +############################################################ # For the small projects Makefile, you basically need to fill in only @@ -18,15 +23,6 @@ target = multigrid debug-mode = on -# As third field, we need to give the path to the top-level deal.II -# directory. You need to adjust this to your needs. Since this path is -# probably the most often needed one in the Makefile internals, it is -# designated by a single-character variable, since that can be -# reference using $D only, i.e. without the parentheses that are -# required for most other parameters, as e.g. in $(target). -D = ../../../deal.II/ - - # The last field specifies the names of data and other files that # shall be deleted when calling `make clean'. Object and backup files, # executables and the like are removed anyway. Here, we give a list of diff --git a/tests/big-tests/nonlinear/fixed-point-iteration/Makefile b/tests/big-tests/nonlinear/fixed-point-iteration/Makefile index 0010ae461f..7598a66d68 100644 --- a/tests/big-tests/nonlinear/fixed-point-iteration/Makefile +++ b/tests/big-tests/nonlinear/fixed-point-iteration/Makefile @@ -1,5 +1,11 @@ # $Id$ -# Copyright W. Bangerth, University of Heidelberg, 1998 +# Copyright by the deal.II authors 1998, 1999, 2000 + +############################################################ +# $D contains the root of the deal distribution and should +# be supplied as a command line argument D=../../... +############################################################ + # Template for makefiles for the examples subdirectory. In principle, # everything should be done automatically if you set the target file @@ -36,10 +42,8 @@ delete-files = gnuplot* *.eps ############################################################################### # Internals -#deal include base path -D = ../../../.. -include ../../../Make.global_options +include $D/Make.global_options diff --git a/tests/big-tests/poisson/Makefile b/tests/big-tests/poisson/Makefile index df26bf56a4..9cc2eaa036 100644 --- a/tests/big-tests/poisson/Makefile +++ b/tests/big-tests/poisson/Makefile @@ -1,5 +1,10 @@ # $Id$ -# Copyright W. Bangerth, University of Heidelberg, 1998 +# Copyright by the deal.II authors 1998, 1999, 2000 + +############################################################ +# $D contains the root of the deal distribution and should +# be supplied as a command line argument D=../../... +############################################################ # Template for makefiles for the examples subdirectory. In principle, # everything should be done automatically if you set the target file @@ -36,9 +41,6 @@ delete-files = results/*gnuplot results/*.eps ############################################################################### # Internals -#deal include base path -D = ../../../deal.II/ - include $D/common/Make.global_options @@ -48,7 +50,7 @@ cc-files = $(filter-out *%, $(shell echo *.cc)) o-files = $(cc-files:.cc=.o) go-files = $(cc-files:.cc=.go) h-files = $(filter-out *%, $(shell echo *.h)) -lib-h-files = $(filter-out *%, $(shell echo ../../include/*/*.h)) +lib-h-files = $(filter-out *%, $(shell echo $D/include/*/*.h)) # list of libraries needed to link with libs.g = ./Obj.g.a \ -- 2.39.5