]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Be a little more clever about determining which mpi include path to use.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 18 Mar 2004 20:52:07 +0000 (20:52 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 18 Mar 2004 20:52:07 +0000 (20:52 +0000)
git-svn-id: https://svn.dealii.org/trunk@8825 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/common/Make.global_options.in

index a15810ff7b4012f6b255e2948f0e883506051c54..6d02737a585b484018ab871bddca3f1879c02fcd 100644 (file)
@@ -147,7 +147,6 @@ include-path-contrib-boost = $D/contrib/boost/include
 include-path-tecplot       = $(TECIO_INCLUDE)
 include-path-petsc         = $(DEAL_II_PETSC_DIR)/include
 include-path-petsc-bmake   = $(DEAL_II_PETSC_DIR)/bmake/$(DEAL_II_PETSC_ARCH)
-include-path-petsc-mpi     = $(DEAL_II_PETSC_DIR)/src/sys/src/mpiuni
 include-path-metis         = $(DEAL_II_METIS_DIR)/Lib
 
 INCLUDE           = $(addprefix -I, $(include-path-base) \
@@ -157,15 +156,21 @@ INCLUDE           = $(addprefix -I, $(include-path-base) \
                                    $(include-path-contrib-boost)\
                                    $(include-path-tecplot))
 
-# add PETSc and METIS include path if necessary
+# add PETSc and METIS include path if necessary. this rule
+# (and the one further down below to get correct flags) should eventually
+# be replaced by something where we do not blindly include PETSc make files
+# (and thus import all of its variables), but rather set up a scheme to
+# extract these values upon configuration
 ifeq ($(USE_CONTRIB_PETSC),yes)
+  include $(DEAL_II_PETSC_DIR)/bmake/$(DEAL_II_PETSC_ARCH)/packages
   INCLUDE += -I$(include-path-petsc) -I$(include-path-petsc-bmake)\
-             -I$(include-path-petsc-mpi)
+             $(MPI_INCLUDE)
 endif
 ifeq ($(USE_CONTRIB_METIS),yes)
   INCLUDE += -I$(include-path-metis)
 endif
 
+
 # compiler flags for debug and optimized mode
 CXXFLAGS.g   = @DEFS@ @CXXFLAGSG@  $(INCLUDE)
 CXXFLAGS.o   = @DEFS@ @CXXFLAGSO@  $(INCLUDE)

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.