Conditionalize some files on the use of PETSc.

git-svn-id: https://svn.dealii.org/trunk@9371 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/lac/Makefile b/deal.II/lac/Makefile
index 0e614ae912d1a32e69bdda213ad985c5e08a41c6..b33d5c41eb4e758371a20742973a2c32c6cbe135 100644 (file)
--- a/deal.II/lac/Makefile
+++ b/deal.II/lac/Makefile
@@ -26,7 +26,7 @@ endif
 
 $(LIBDIR)/lac/%.g.$(OBJEXT) :
        @echo "=====lac==============debug======$(MT)== $(<F)"
-       @$(CXX) $(CXXFLAGS.g) -c $< -o $@
+       @$(CXX) $(CXXFLAGS.g) -c $< -o $@ -save-temps
 $(LIBDIR)/lac/%.$(OBJEXT) :
        @echo "=====lac==============optimized==$(MT)== $(<F)"
        @$(CXX) $(CXXFLAGS.o) -c $< -o $@

diff --git a/deal.II/lac/include/lac/petsc_block_sparse_matrix.h b/deal.II/lac/include/lac/petsc_block_sparse_matrix.h
index 42e4b4ee9d265a2bf887370ade4e6c78a1312460..f44484bd5b1778fc09e305b0f8c318bf451bb74b 100644 (file)
--- a/deal.II/lac/include/lac/petsc_block_sparse_matrix.h
+++ b/deal.II/lac/include/lac/petsc_block_sparse_matrix.h
@@ -21,6 +21,8 @@
 #include <cmath>
 
 
+#ifdef DEAL_II_USE_PETSC
+
 
 /*! @addtogroup PETSc
  *@{
@@ -50,7 +52,7 @@ namespace PETScWrappers
  *
  * @author Wolfgang Bangerth, 2004
  */
-  class BlockSparseMatrix : public BlockMatrixBase<SparseMatrix>
+  class BlockSparseMatrix : public BlockMatrixBase<PETScWrappers::SparseMatrix>
   {
     public:
                                        /**
@@ -198,4 +200,6 @@ namespace PETScWrappers
 }
 
 
+#endif    // DEAL_II_USE_PETSC
+
 #endif    // __deal2__petsc_block_sparse_matrix_h

diff --git a/deal.II/lac/include/lac/petsc_parallel_block_sparse_matrix.h b/deal.II/lac/include/lac/petsc_parallel_block_sparse_matrix.h
index 733d19fe9fc7606407a611b5511658084223961b..3a8e520fce9c083abb98f7ee19fdbdbf00234a9c 100644 (file)
--- a/deal.II/lac/include/lac/petsc_parallel_block_sparse_matrix.h
+++ b/deal.II/lac/include/lac/petsc_parallel_block_sparse_matrix.h
@@ -20,6 +20,7 @@
 #include <lac/petsc_parallel_sparse_matrix.h>
 #include <cmath>
 
+#ifdef DEAL_II_USE_PETSC
 
 
 /*! @addtogroup PETSc
@@ -195,4 +196,6 @@ namespace PETScWrappers
 }
 
 
+#endif    // DEAL_II_USE_PETSC
+
 #endif    // __deal2__petsc_parallel_block_sparse_matrix_h

diff --git a/deal.II/lac/source/petsc_block_sparse_matrix.cc b/deal.II/lac/source/petsc_block_sparse_matrix.cc
index d2354b2297a37672ecbed12d81c40cde0709f882..7ba4a2b27a51a8f6fa71fc67c64ae81340f3ed59 100644 (file)
--- a/deal.II/lac/source/petsc_block_sparse_matrix.cc
+++ b/deal.II/lac/source/petsc_block_sparse_matrix.cc
@@ -14,7 +14,7 @@
 #include <lac/petsc_block_sparse_matrix.h>
 
 
-
+#ifdef DEAL_II_USE_PETSC
 
 namespace PETScWrappers
 {
@@ -94,4 +94,4 @@ namespace PETScWrappers
 }
 
   
-
+#endif

diff --git a/deal.II/lac/source/petsc_parallel_block_sparse_matrix.cc b/deal.II/lac/source/petsc_parallel_block_sparse_matrix.cc
index 2f7113cf92f9a7b5541272ee893a72beba175dd8..98acedf670f4a3b0d0fc7fc761f0e83ebc996e54 100644 (file)
--- a/deal.II/lac/source/petsc_parallel_block_sparse_matrix.cc
+++ b/deal.II/lac/source/petsc_parallel_block_sparse_matrix.cc
@@ -14,7 +14,7 @@
 #include <lac/petsc_parallel_block_sparse_matrix.h>
 
 
-
+#ifdef DEAL_II_USE_PETSC
 
 namespace PETScWrappers
 {
@@ -107,3 +107,4 @@ namespace PETScWrappers
 
   
 
+#endif