From 054d6f54a1e4629b642fae3315a1190475003771 Mon Sep 17 00:00:00 2001 From: bangerth Date: Tue, 27 May 2008 23:03:09 +0000 Subject: [PATCH] Do detection of directories in a slightly more readable way. git-svn-id: https://svn.dealii.org/trunk@16254 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/Makefile | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index e6307198cc..46d78ffdae 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -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) -- 2.39.5