configure subdirectories

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

diff --git a/tests/.cvsignore b/tests/.cvsignore
index c63062c1ccdd8e8aa61b03a5b04d3afea9d583c8..80373606d3ba9fc4fa5ad1dfc4c4e946f1aa2789 100644 (file)
--- 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 b2878be7d9fa53f51839da1fff1b09b8edf9b2d8..13ac9378c59edc582c64276562499949bd93a439 100644 (file)
--- 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 564ed89914ae2fae20e2b4e7fc93d57fe1c3f617..4a01bc2fdd786aee8d37b5389039b484ede36495 100644 (file)
--- 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 ecaebd8e790fb28734c8d018cac9b753260ae67a..ba942a050e57e027da0fdf8ec17b34ef15966095 100644 (file)
--- 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 (file)
index 0000000..f3c7a7c
--- /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 30b64a839050b9e391f35f6f11632d31559921ba..aea74b5b66e0f0608861bea4ad1e2f461e8c1e61 100644 (file)
--- 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 7cacedf07f58935e5aacbcda206bc036dd96d1f3..bda0e01e07f60a1fccdef8d3ada69b8d6bee65cb 100755 (executable)
--- 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 <<EOF
 
@@ -675,7 +675,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile base/Makefile lac/Makefile fe/Makefile deal.II/Makefile big-tests/Makefile"}
 EOF
 cat >> $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 317fc4e73a10063a53addf600574981057b5b2f8..bfdeb75dba59fb0adb461914d885caa7d18a6dba 100644 (file)
--- 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 5eb9c98dc25dc6c61dadbc205b02bde6656f3a55..ccf01b53e8f600beea2464fcdad468f8323b060e 100644 (file)
--- 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 cdf79fadcce669a76b6d1a1f403c634c14c79750..d9a50cd784892c6a419dba6246e3a9015bc0452b 100644 (file)
--- 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 d0bdc5a026a1f7901c6784b9978504cc94b56f19..453d255e1f32774ff66f625272d1b2c34369ea10 100644 (file)
--- 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 93799a31fd0b2ba7d9610109c54a2175eb5cf504..4cb0be8314b1244b5640882cb8fd8c67fa8a3f46 100644 (file)
--- 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 37f0cedab3654942652cd23aef56da0afb5247ef..cfc41f15640d835925591bcf657a30dbd794194c 100644 (file)
--- 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 7284a51bf18ef16d2ee3caf8d55be70ce2702323..b89fe4e8645e60f6f02d1597f7c2a493ba2db57c 100644 (file)
--- 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