From: bangerth Date: Mon, 20 Sep 2010 03:21:38 +0000 (+0000) Subject: Further simplify most of the Makefiles. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c791287a3c4d806ee93eb8fcdf9872f3ed3a36a;p=dealii-svn.git Further simplify most of the Makefiles. git-svn-id: https://svn.dealii.org/trunk@22080 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/Makefile.rules b/tests/Makefile.rules index c3a8d372f2..fb42993015 100644 --- a/tests/Makefile.rules +++ b/tests/Makefile.rules @@ -186,6 +186,25 @@ report+mail: fi ; \ done +############################################################ +# by default, all .cc-files are tests. individual Makefiles +# may overrule this: +ifeq ($(tests),) +tests = $(basename $(wildcard *.cc)) +endif + +############################################################ +# link with all libraries: +libraries = $(lib-deal2-1d.g) \ + $(lib-deal2-2d.g) \ + $(lib-deal2-3d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libraries_o = $(lib-deal2-1d.o) \ + $(lib-deal2-2d.o) \ + $(lib-deal2-3d.o) \ + $(lib-lac.o) \ + $(lib-base.o) ############################################################ # After all these general rules, here is the target to be @@ -208,7 +227,7 @@ update: $(tests:%=%/update) clean: -rm -f Makefile.depend Makefile.tests */obj.$(OBJEXT) \ - */obj.g.$(OBJEXT) */output *~ + */obj.g.$(OBJEXT) */output *~ */status */OK distclean: clean -rm -f */exe *.testcase *.gpl *.eps *.gnuplot diff --git a/tests/a-framework/Makefile b/tests/a-framework/Makefile index 7de41a4da0..a722f76008 100644 --- a/tests/a-framework/Makefile +++ b/tests/a-framework/Makefile @@ -3,32 +3,8 @@ # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by the deal.II authors ############################################################ -############################################################ -# Include general settings for including DEAL libraries -############################################################ - include ../Makefile.paths include $D/common/Make.global_options -debug-mode = on - -libraries = $(lib-deal2-1d.g) \ - $(lib-deal2-2d.g) \ - $(lib-deal2-3d.g) \ - $(lib-lac.g) \ - $(lib-base.g) - -default: run-tests - -############################################################ - -# all .cc-files are tests: -tests = $(basename $(wildcard *.cc)) - -############################################################ - - include ../Makefile.rules include Makefile.depend include Makefile.tests - -.PHONY: default diff --git a/tests/aniso/Makefile b/tests/aniso/Makefile index e171efdc36..ab2ba54951 100644 --- a/tests/aniso/Makefile +++ b/tests/aniso/Makefile @@ -3,30 +3,8 @@ # Copyright (C) 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2010 by the deal.II authors ############################################################ -############################################################ -# Include general settings for including DEAL libraries -############################################################ - include ../Makefile.paths include $D/common/Make.global_options -debug-mode = on - -libraries = $(lib-deal2-1d.g) \ - $(lib-deal2-2d.g) \ - $(lib-deal2-3d.g) \ - $(lib-lac.g) \ - $(lib-base.g) - -default: run-tests - -############################################################ - -# all .cc-files are tests: -tests = $(basename $(wildcard *.cc)) - -############################################################ - - include ../Makefile.rules include Makefile.depend include Makefile.tests diff --git a/tests/base/Makefile b/tests/base/Makefile index b65036cd88..7e610285db 100644 --- a/tests/base/Makefile +++ b/tests/base/Makefile @@ -9,15 +9,11 @@ include ../Makefile.paths include $D/common/Make.global_options -debug-mode = on -libraries += $(lib-lac.g) \ - $(lib-base.g) default: run-tests ############################################################ - # rules to generate the threading tests. the .cc files are # automatically generated; note that for the output generation, we # have to sort the output since otherwise in MT mode things would come diff --git a/tests/bits/Makefile b/tests/bits/Makefile index 7de41a4da0..a722f76008 100644 --- a/tests/bits/Makefile +++ b/tests/bits/Makefile @@ -3,32 +3,8 @@ # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by the deal.II authors ############################################################ -############################################################ -# Include general settings for including DEAL libraries -############################################################ - include ../Makefile.paths include $D/common/Make.global_options -debug-mode = on - -libraries = $(lib-deal2-1d.g) \ - $(lib-deal2-2d.g) \ - $(lib-deal2-3d.g) \ - $(lib-lac.g) \ - $(lib-base.g) - -default: run-tests - -############################################################ - -# all .cc-files are tests: -tests = $(basename $(wildcard *.cc)) - -############################################################ - - include ../Makefile.rules include Makefile.depend include Makefile.tests - -.PHONY: default diff --git a/tests/codim_one/Makefile b/tests/codim_one/Makefile index 27ec68f227..91d56844fc 100644 --- a/tests/codim_one/Makefile +++ b/tests/codim_one/Makefile @@ -1,32 +1,10 @@ ############################################################ # $Id: Makefile 16047 2008-05-07 16:51:50Z heltai $ -# Copyright (C) 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009 by the deal.II authors -############################################################ - -############################################################ -# Include general settings for including DEAL libraries +# Copyright (C) 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 by the deal.II authors ############################################################ include ../Makefile.paths include $D/common/Make.global_options -debug-mode = on - -libraries = $(lib-deal2-1d.g) \ - $(lib-deal2-2d.g) \ - $(lib-deal2-3d.g) \ - $(lib-lac.g) \ - $(lib-base.g) - -default: run-tests - -############################################################ - -# all .cc-files are tests: -tests = $(basename $(wildcard *.cc)) - -############################################################ - - include ../Makefile.rules include Makefile.depend include Makefile.tests diff --git a/tests/deal.II/Makefile b/tests/deal.II/Makefile index 6c169ddcb3..24aae98bf3 100644 --- a/tests/deal.II/Makefile +++ b/tests/deal.II/Makefile @@ -3,30 +3,8 @@ # Copyright (C) 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 by the deal.II authors ############################################################ -############################################################ -# Include general settings for including DEAL libraries -############################################################ - include ../Makefile.paths include $D/common/Make.global_options -debug-mode = on - -libraries = $(lib-deal2-1d.g) \ - $(lib-deal2-2d.g) \ - $(lib-deal2-3d.g) \ - $(lib-lac.g) \ - $(lib-base.g) - -default: run-tests - -############################################################ - -# all .cc-files are tests: -tests = $(basename $(wildcard *.cc)) - -############################################################ - - include ../Makefile.rules include Makefile.depend include Makefile.tests diff --git a/tests/fail/Makefile b/tests/fail/Makefile index beb9a6d6e4..3417226b49 100644 --- a/tests/fail/Makefile +++ b/tests/fail/Makefile @@ -3,31 +3,8 @@ # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2010 by the deal.II authors ############################################################ -############################################################ -# Include general settings for including DEAL libraries -############################################################ - include ../Makefile.paths include $D/common/Make.global_options -debug-mode = on - -libraries = $(lib-deal2-1d.g) \ - $(lib-deal2-2d.g) \ - $(lib-deal2-3d.g) \ - $(lib-lac.g) \ - $(lib-base.g) - -default: run-tests - -############################################################ - -# all .cc-files are tests: -tests = $(basename $(wildcard *.cc)) - -############################################################ - -T: - @echo $(tests) include ../Makefile.rules include Makefile.depend include Makefile.tests diff --git a/tests/fe/Makefile b/tests/fe/Makefile index 04af9df404..a722f76008 100644 --- a/tests/fe/Makefile +++ b/tests/fe/Makefile @@ -3,30 +3,8 @@ # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by the deal.II authors ############################################################ -############################################################ -# Include general settings for including DEAL libraries -############################################################ - include ../Makefile.paths include $D/common/Make.global_options -debug-mode = on - -libraries = $(lib-deal2-1d.g) \ - $(lib-deal2-2d.g) \ - $(lib-deal2-3d.g) \ - $(lib-lac.g) \ - $(lib-base.g) - -default: run-tests - -############################################################ - -# all .cc-files are tests: -tests = $(basename $(wildcard *.cc)) - -############################################################ - - include ../Makefile.rules include Makefile.depend include Makefile.tests diff --git a/tests/hp/Makefile b/tests/hp/Makefile index 6c169ddcb3..24aae98bf3 100644 --- a/tests/hp/Makefile +++ b/tests/hp/Makefile @@ -3,30 +3,8 @@ # Copyright (C) 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 by the deal.II authors ############################################################ -############################################################ -# Include general settings for including DEAL libraries -############################################################ - include ../Makefile.paths include $D/common/Make.global_options -debug-mode = on - -libraries = $(lib-deal2-1d.g) \ - $(lib-deal2-2d.g) \ - $(lib-deal2-3d.g) \ - $(lib-lac.g) \ - $(lib-base.g) - -default: run-tests - -############################################################ - -# all .cc-files are tests: -tests = $(basename $(wildcard *.cc)) - -############################################################ - - include ../Makefile.rules include Makefile.depend include Makefile.tests diff --git a/tests/hsl/Makefile b/tests/hsl/Makefile index 7de41a4da0..a722f76008 100644 --- a/tests/hsl/Makefile +++ b/tests/hsl/Makefile @@ -3,32 +3,8 @@ # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by the deal.II authors ############################################################ -############################################################ -# Include general settings for including DEAL libraries -############################################################ - include ../Makefile.paths include $D/common/Make.global_options -debug-mode = on - -libraries = $(lib-deal2-1d.g) \ - $(lib-deal2-2d.g) \ - $(lib-deal2-3d.g) \ - $(lib-lac.g) \ - $(lib-base.g) - -default: run-tests - -############################################################ - -# all .cc-files are tests: -tests = $(basename $(wildcard *.cc)) - -############################################################ - - include ../Makefile.rules include Makefile.depend include Makefile.tests - -.PHONY: default diff --git a/tests/lac/Makefile b/tests/lac/Makefile index 57cfc6c057..6476e92010 100644 --- a/tests/lac/Makefile +++ b/tests/lac/Makefile @@ -3,31 +3,8 @@ # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by the deal.II authors ############################################################ -############################################################ -# Include general settings for including DEAL libraries -############################################################ - include ../Makefile.paths include $D/common/Make.global_options -debug-mode = on - -libraries = $(lib-lac.g) \ - $(lib-base.g) -libraries_o = $(lib-lac.o) \ - $(lib-base.o) - -default: run-tests - -############################################################ - -# all .cc-files are tests: -tests = $(basename $(wildcard *.cc)) - -############################################################ - - include ../Makefile.rules include Makefile.depend include Makefile.tests - -.PHONY: default diff --git a/tests/lapack/Makefile b/tests/lapack/Makefile index 4cff915ae0..da6b20360f 100644 --- a/tests/lapack/Makefile +++ b/tests/lapack/Makefile @@ -3,31 +3,8 @@ # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2010 by the deal.II authors ############################################################ -############################################################ -# Include general settings for including DEAL libraries -############################################################ - include ../Makefile.paths include $D/common/Make.global_options -debug-mode = on - -libraries = $(lib-lac.g) \ - $(lib-base.g) -libraries_o = $(lib-lac.o) \ - $(lib-base.o) - -default: run-tests - -############################################################ - -# all .cc-files are tests: -tests = $(basename $(wildcard *.cc)) - -############################################################ - - include ../Makefile.rules include Makefile.depend include Makefile.tests - -.PHONY: default diff --git a/tests/metis/Makefile b/tests/metis/Makefile index 7de41a4da0..a722f76008 100644 --- a/tests/metis/Makefile +++ b/tests/metis/Makefile @@ -3,32 +3,8 @@ # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by the deal.II authors ############################################################ -############################################################ -# Include general settings for including DEAL libraries -############################################################ - include ../Makefile.paths include $D/common/Make.global_options -debug-mode = on - -libraries = $(lib-deal2-1d.g) \ - $(lib-deal2-2d.g) \ - $(lib-deal2-3d.g) \ - $(lib-lac.g) \ - $(lib-base.g) - -default: run-tests - -############################################################ - -# all .cc-files are tests: -tests = $(basename $(wildcard *.cc)) - -############################################################ - - include ../Makefile.rules include Makefile.depend include Makefile.tests - -.PHONY: default diff --git a/tests/multigrid/Makefile b/tests/multigrid/Makefile index fe1052be16..3a7da77cd3 100644 --- a/tests/multigrid/Makefile +++ b/tests/multigrid/Makefile @@ -9,24 +9,6 @@ include ../Makefile.paths include $D/common/Make.global_options -debug-mode = on - -libraries = $(lib-deal2-1d.g) \ - $(lib-deal2-2d.g) \ - $(lib-deal2-3d.g) \ - $(lib-lac.g) \ - $(lib-base.g) - -default: run-tests - -############################################################ - -# all .cc-files are tests: -tests = $(basename $(wildcard *.cc)) - -############################################################ - - include ../Makefile.rules include Makefile.depend include Makefile.tests diff --git a/tests/petsc/Makefile b/tests/petsc/Makefile index d40682b73a..60f4d955e2 100644 --- a/tests/petsc/Makefile +++ b/tests/petsc/Makefile @@ -9,25 +9,6 @@ include ../Makefile.paths include $D/common/Make.global_options -debug-mode = on - -libraries = $(lib-lac.g) \ - $(lib-base.g) -libraries_o = $(lib-lac.o) \ - $(lib-base.o) - -default: run-tests - -############################################################ - -# all .cc-files are tests: -tests = $(basename $(wildcard *.cc)) - -############################################################ - - include ../Makefile.rules include Makefile.depend include Makefile.tests - -.PHONY: default diff --git a/tests/test/Makefile b/tests/test/Makefile index ac08cfb744..c77f9fdf96 100644 --- a/tests/test/Makefile +++ b/tests/test/Makefile @@ -15,12 +15,6 @@ include ../Makefile.paths include $D/common/Make.global_options debug-mode = on -default: run-tests - -############################################################ - -# all .cc-files are tests: -tests = $(basename $(wildcard *.cc)) ############################################################ # phony header file to force compilation whenever diff --git a/tests/trilinos/Makefile b/tests/trilinos/Makefile index d40682b73a..f9ffd5e25b 100644 --- a/tests/trilinos/Makefile +++ b/tests/trilinos/Makefile @@ -3,31 +3,8 @@ # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2010 by the deal.II authors ############################################################ -############################################################ -# Include general settings for including DEAL libraries -############################################################ - include ../Makefile.paths include $D/common/Make.global_options -debug-mode = on - -libraries = $(lib-lac.g) \ - $(lib-base.g) -libraries_o = $(lib-lac.o) \ - $(lib-base.o) - -default: run-tests - -############################################################ - -# all .cc-files are tests: -tests = $(basename $(wildcard *.cc)) - -############################################################ - - include ../Makefile.rules include Makefile.depend include Makefile.tests - -.PHONY: default diff --git a/tests/umfpack/Makefile b/tests/umfpack/Makefile index 0b5ea82109..07389ec3f0 100644 --- a/tests/umfpack/Makefile +++ b/tests/umfpack/Makefile @@ -3,37 +3,8 @@ # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2010 by the deal.II authors ############################################################ -############################################################ -# Include general settings for including DEAL libraries -############################################################ - include ../Makefile.paths include $D/common/Make.global_options -debug-mode = on - -libraries = $(lib-deal2-1d.g) \ - $(lib-deal2-2d.g) \ - $(lib-deal2-3d.g) \ - $(lib-lac.g) \ - $(lib-base.g) -libraries_o = $(lib-deal2-1d.o) \ - $(lib-deal2-2d.o) \ - $(lib-deal2-3d.o) \ - $(lib-lac.o) \ - $(lib-base.o) - -default: run-tests - -############################################################ - -# all .cc-files are tests: -tests = $(basename $(wildcard *.cc)) - -############################################################ - - include ../Makefile.rules include Makefile.depend include Makefile.tests - -.PHONY: default