From 2c4723d7126fdd55859a796786b44201642952fd Mon Sep 17 00:00:00 2001 From: guido Date: Thu, 9 Mar 2000 23:55:43 +0000 Subject: [PATCH] configure subdirectories git-svn-id: https://svn.dealii.org/trunk@2573 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/.cvsignore | 2 +- tests/Makefile.in | 20 ++++++++++---------- tests/base/.cvsignore | 2 +- tests/base/{Makefile => Makefile.in} | 7 ++++--- tests/big-tests/.cvsignore | 1 + tests/big-tests/{Makefile => Makefile.in} | 12 +++++++++++- tests/configure | 4 ++-- tests/configure.in | 2 +- tests/deal.II/.cvsignore | 1 + tests/deal.II/{Makefile => Makefile.in} | 7 ++++--- tests/fe/.cvsignore | 2 +- tests/fe/{Makefile => Makefile.in} | 7 ++++--- tests/lac/.cvsignore | 2 +- tests/lac/{Makefile => Makefile.in} | 7 ++++--- 14 files changed, 46 insertions(+), 30 deletions(-) rename tests/base/{Makefile => Makefile.in} (97%) create mode 100644 tests/big-tests/.cvsignore rename tests/big-tests/{Makefile => Makefile.in} (67%) rename tests/deal.II/{Makefile => Makefile.in} (98%) rename tests/fe/{Makefile => Makefile.in} (96%) rename tests/lac/{Makefile => Makefile.in} (97%) diff --git a/tests/.cvsignore b/tests/.cvsignore index c63062c1cc..80373606d3 100644 --- a/tests/.cvsignore +++ b/tests/.cvsignore @@ -1 +1 @@ -config.log config.status +config.log config.status Makefile diff --git a/tests/Makefile.in b/tests/Makefile.in index b2878be7d9..13ac9378c5 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -4,36 +4,36 @@ all: base lac fe deal.II big-tests base: - cd base ; $(MAKE) D=@DEAL2_DIR@ + cd base ; $(MAKE) lac: - cd lac ; $(MAKE) D=@DEAL2_DIR@ + cd lac ; $(MAKE) fe: - cd fe ; $(MAKE) D=@DEAL2_DIR@ + cd fe ; $(MAKE) deal.II: - cd deal.II ; $(MAKE) D=@DEAL2_DIR@ + cd deal.II ; $(MAKE) big-tests: - cd big-tests ; $(MAKE) D=@DEAL2_DIR@ + cd big-tests ; $(MAKE) clean: clean-base clean-lac clean-deal.II clean-fe clean-base: - cd base ; $(MAKE) clean D=@DEAL2_DIR@ + cd base ; $(MAKE) clean clean-lac: - cd lac ; $(MAKE) clean D=@DEAL2_DIR@ + cd lac ; $(MAKE) clean clean-fe: - cd fe ; $(MAKE) clean D=@DEAL2_DIR@ + cd fe ; $(MAKE) clean clean-deal.II: - cd deal.II ; $(MAKE) clean D=@DEAL2_DIR@ + cd deal.II ; $(MAKE) clean clean-big: - cd big-tests ; $(MAKE) clean D=@DEAL2_DIR@ + cd big-tests ; $(MAKE) clean .PHONY : all base lac fe deal.II big-tests clean clean-base clean-lac clean-fe clean-deal.II clean-big diff --git a/tests/base/.cvsignore b/tests/base/.cvsignore index 564ed89914..4a01bc2fdd 100644 --- a/tests/base/.cvsignore +++ b/tests/base/.cvsignore @@ -1,4 +1,4 @@ *.go reference logtest tensor *.testcase *.dat -Make.depend +Make.depend Makefile diff --git a/tests/base/Makefile b/tests/base/Makefile.in similarity index 97% rename from tests/base/Makefile rename to tests/base/Makefile.in index ecaebd8e79..ba942a050e 100644 --- a/tests/base/Makefile +++ b/tests/base/Makefile.in @@ -1,13 +1,14 @@ ############################################################ -# $D contains the root of the deal distribution and should -# be supplied as a command line argument D=../../... +# $Id$ +# Copyright (C) 2000 by the deal.II authors ############################################################ - ############################################################ # Include general settings for including DEAL libraries ############################################################ +D = @DEAL2_DIR@ + include $D/common/Make.global_options diff --git a/tests/big-tests/.cvsignore b/tests/big-tests/.cvsignore new file mode 100644 index 0000000000..f3c7a7c5da --- /dev/null +++ b/tests/big-tests/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/tests/big-tests/Makefile b/tests/big-tests/Makefile.in similarity index 67% rename from tests/big-tests/Makefile rename to tests/big-tests/Makefile.in index 30b64a8390..aea74b5b66 100644 --- a/tests/big-tests/Makefile +++ b/tests/big-tests/Makefile.in @@ -1,5 +1,15 @@ +############################################################ # $Id$ -# Copyright W. Bangerth, University of Heidelberg, 1998 +# Copyright (C) 2000 by the deal.II authors +############################################################ + +############################################################ +# Include general settings for including DEAL libraries +############################################################ + +D = @DEAL2_DIR@ + +include $D/common/Make.global_options # list the directories we want to visit diff --git a/tests/configure b/tests/configure index 7cacedf07f..bda0e01e07 100755 --- a/tests/configure +++ b/tests/configure @@ -601,7 +601,7 @@ done ac_given_srcdir=$srcdir -trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "Makefile base/Makefile lac/Makefile fe/Makefile deal.II/Makefile big-tests/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then diff --git a/tests/configure.in b/tests/configure.in index 317fc4e73a..bfdeb75dba 100644 --- a/tests/configure.in +++ b/tests/configure.in @@ -23,4 +23,4 @@ AC_ARG_WITH(deal, fi) AC_SUBST(DEAL2_DIR) -AC_OUTPUT(Makefile) +AC_OUTPUT(Makefile base/Makefile lac/Makefile fe/Makefile deal.II/Makefile big-tests/Makefile) diff --git a/tests/deal.II/.cvsignore b/tests/deal.II/.cvsignore index 5eb9c98dc2..ccf01b53e8 100644 --- a/tests/deal.II/.cvsignore +++ b/tests/deal.II/.cvsignore @@ -1,2 +1,3 @@ +Makefile Make.depend *.go *.testcase diff --git a/tests/deal.II/Makefile b/tests/deal.II/Makefile.in similarity index 98% rename from tests/deal.II/Makefile rename to tests/deal.II/Makefile.in index cdf79fadcc..d9a50cd784 100644 --- a/tests/deal.II/Makefile +++ b/tests/deal.II/Makefile.in @@ -1,13 +1,14 @@ ############################################################ -# $D contains the root of the deal distribution and should -# be supplied as a command line argument D=../../... +# $Id$ +# Copyright (C) 2000 by the deal.II authors ############################################################ - ############################################################ # Include general settings for including DEAL libraries ############################################################ +D = @DEAL2_DIR@ + include $D/common/Make.global_options diff --git a/tests/fe/.cvsignore b/tests/fe/.cvsignore index d0bdc5a026..453d255e1f 100644 --- a/tests/fe/.cvsignore +++ b/tests/fe/.cvsignore @@ -1,4 +1,4 @@ -Make.depend +Makefile Make.depend *.dat show_shapes show_transform diff --git a/tests/fe/Makefile b/tests/fe/Makefile.in similarity index 96% rename from tests/fe/Makefile rename to tests/fe/Makefile.in index 93799a31fd..4cb0be8314 100644 --- a/tests/fe/Makefile +++ b/tests/fe/Makefile.in @@ -1,13 +1,14 @@ ############################################################ -# $D contains the root of the deal distribution and should -# be supplied as a command line argument D=../../... +# $Id$ +# Copyright (C) 2000 by the deal.II authors ############################################################ - ############################################################ # Include general settings for including DEAL libraries ############################################################ +D = @DEAL2_DIR@ + include $D/common/Make.global_options diff --git a/tests/lac/.cvsignore b/tests/lac/.cvsignore index 37f0cedab3..cfc41f1564 100644 --- a/tests/lac/.cvsignore +++ b/tests/lac/.cvsignore @@ -1,4 +1,4 @@ -Make.depend +Makefile Make.depend *.go *.testcase *.output diff --git a/tests/lac/Makefile b/tests/lac/Makefile.in similarity index 97% rename from tests/lac/Makefile rename to tests/lac/Makefile.in index 7284a51bf1..b89fe4e864 100644 --- a/tests/lac/Makefile +++ b/tests/lac/Makefile.in @@ -1,13 +1,14 @@ ############################################################ -# $D contains the root of the deal distribution and should -# be supplied as a command line argument D=../../... +# $Id$ +# Copyright (C) 2000 by the deal.II authors ############################################################ - ############################################################ # Include general settings for including DEAL libraries ############################################################ +D = @DEAL2_DIR@ + include $D/common/Make.global_options -- 2.39.5