]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Do detection of directories in a slightly more readable way.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 27 May 2008 23:03:09 +0000 (23:03 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 27 May 2008 23:03:09 +0000 (23:03 +0000)
git-svn-id: https://svn.dealii.org/trunk@16254 0785d39b-7218-0410-832d-ea1e28bc413d

tests/Makefile

index e6307198ccaedc9c7f1c877e876d095a28b2d86e..46d78ffdaef9b831410e49239f9b7e82dc142338 100644 (file)
@@ -6,20 +6,17 @@ include Makefile.paths
 include $D/common/Make.global_options
 
 # first define the directories we should work on
-nofail-dirs=base lac fe deal.II multigrid bits hp
-
-ifeq ($(USE_CONTRIB_PETSC),yes)
-  nofail-dirs += petsc
-endif
-
-ifeq ($(USE_CONTRIB_UMFPACK),yes)
-  nofail-dirs += umfpack
-endif
-
-ifneq ($(shell grep 'define HAVE_LIBLAPACK' $D/base/include/base/config.h),)
-  nofail-dirs += lapack
-endif
-
+nofail-dirs = base      \
+              lac       \
+              fe        \
+              deal.II   \
+              multigrid \
+              bits      \
+              hp        \
+             $(shell if test "$(USE_CONTRIB_PETSC)" = yes ; then echo petsc ; fi) \
+             $(shell if test "$(USE_CONTRIB_UMFPACK)" = yes ; then echo umfpack ; fi) \
+             $(shell if grep -q 'define HAVE_LIBLAPACK' $D/base/include/base/config.h ;\
+                then echo umfpack ; fi)
 
 # now define the targets that actually do something
 all: $(addprefix do-,$(nofail-dirs) fail)

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.