]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Make sure the program is not compiled/run when not using PETSc or P4EST or when using...
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 28 Oct 2010 15:36:32 +0000 (15:36 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 28 Oct 2010 15:36:32 +0000 (15:36 +0000)
git-svn-id: https://svn.dealii.org/trunk@22539 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/examples/step-40/Makefile

index 29c5e1e6256124bba46e56f5d9a696bd251c95da..0a60997d438c16db1b72308425b3d8673cac47d9 100644 (file)
@@ -52,26 +52,18 @@ include $D/common/Make.global_options
 #
 # The same holds true if we use threads: PETSc and threads doesn't
 # seem to work well together...
-ifneq ($(USE_CONTRIB_PETSC)$(enable-threads),yesno)
-  ifneq ($(USE_CONTRIB_PETSC),yes)
+ifneq ($(USE_CONTRIB_PETSC)$(enable-threads)$(USE_CONTRIB_P4EST),yesnoyes)
 default run clean:
        @echo
        @echo "==========================================================="
-       @echo "=   This program cannot be compiled without PETSc. Make   ="
-       @echo "=   sure you have PETSc installed and detected during     ="
-       @echo "=   configuration of deal.II                              ="
+       @echo "=   This program can only be run with the following       ="
+       @echo "=   configuration:                                        ="
+       @echo "=   - with PETSc                                          ="
+       @echo "=   - without threads                                     ="
+       @echo "=   - with P4EST                                          ="
+       @echo "=   At least one of these conditions is not satisfied.    ="
        @echo "==========================================================="
        @echo
-  else
-default run clean:
-       @echo
-       @echo "==========================================================="
-       @echo "=   PETSc can not be used when running programs on        ="
-       @echo "=   multiple threads. Make sure you have specified the    ="
-       @echo "=   --disable-threads flag upon configuration of deal.II  ="
-       @echo "==========================================================="
-       @echo
-  endif
 else
 #
 ################################################################

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.