[petsc] 05/07: simplify includes and libs configuration

[Drew Parsons]

This is an automated email from the git hooks/post-receive script.

dparsons pushed a commit to branch master
in repository petsc.

commit 23ddc2e53b47fd22d2614d18d52db28995d67b71
Author: Drew Parsons <dparsons at debian.org>
Date:   Mon Oct 5 01:02:03 2015 +0800

    simplify includes and libs configuration
    
    Remove most extraneous /usr/include or /usr/lib, makes configuration
    line simpler. One of the fruits of PETSc 3.6.2.
---
 debian/rules | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/debian/rules b/debian/rules
index 0226771..ee88068 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,20 +82,13 @@ CONFIGURATION_OPTIONS=--with-shared-libraries \
 	  --with-fortran-interfaces=1 \
 	  --with-mpi-dir=$(PETSC_MPI_DIR) \
 	  --with-blas-lib=-lblas --with-lapack-lib=-llapack \
-	  --with-blacs=1 --with-blacs-include=/usr/include \
-	  --with-blacs-lib=[/usr/lib/libblacsCinit-$(PETSC_MPI).so,/usr/lib/libblacs-$(PETSC_MPI).so] \
-	  --with-scalapack=1 --with-scalapack-include=/usr/include \
-	  --with-scalapack-lib=/usr/lib/libscalapack-$(PETSC_MPI).so \
-	  --with-mumps=1 --with-mumps-include=/usr/include \
-	  --with-mumps-lib=[/usr/lib/libdmumps.so,/usr/lib/libzmumps.so,/usr/lib/libsmumps.so,/usr/lib/libcmumps.so,/usr/lib/libmumps_common.so,/usr/lib/libpord.so] \
-	  --with-suitesparse=1 --with-suitesparse-include=/usr/include/suitesparse \
-	  --with-suitesparse-lib="-lumfpack -lamd -lcholmod -lklu" \
-	  --with-spooles=1 --with-spooles-include=/usr/include/spooles \
-	  --with-spooles-lib=/usr/lib/libspooles.so \
-	  --with-ptscotch=1 --with-ptscotch-include=/usr/include/scotch \
-	  --with-ptscotch-lib=[/usr/lib/libptesmumps.so,/usr/lib/libptscotch.so,/usr/lib/libptscotcherr.so] \
-	  --with-fftw=1 --with-fftw-include=/usr/include \
-	  --with-fftw-lib=[/usr/lib/$(DEB_HOST_MULTIARCH)/libfftw3.so,/usr/lib/$(DEB_HOST_MULTIARCH)/libfftw3_mpi.so] \
+	  --with-blacs=1 --with-blacs-lib="-lblacsCinit-$(PETSC_MPI) -lblacs-$(PETSC_MPI)" \
+	  --with-scalapack=1 --with-scalapack-lib=-lscalapack-$(PETSC_MPI) \
+	  --with-mumps=1 --with-mumps-include=[] --with-mumps-lib="-ldmumps -lzmumps -lsmumps -lcmumps -lmumps_common -lpord" \
+	  --with-suitesparse=1 --with-suitesparse-include=/usr/include/suitesparse --with-suitesparse-lib="-lumfpack -lamd -lcholmod -lklu" \
+	  --with-spooles=1 --with-spooles-include=/usr/include/spooles --with-spooles-lib=-lspooles \
+	  --with-ptscotch=1 --with-ptscotch-include=/usr/include/scotch --with-ptscotch-lib="-lptesmumps -lptscotch -lptscotcherr" \
+	  --with-fftw=1 --with-fftw-include=[] --with-fftw-lib="-lfftw3 -lfftw3_mpi" \
 	  --with-superlu=1 --with-superlu-include=/usr/include/superlu --with-superlu-lib=-lsuperlu \
 	  $(PETSC_HDF5_FLAGS) --CXX_LINKER_FLAGS="-Wl,--no-as-needed" 
 #	  --with-hypre=1 --with-hypre-dir=/usr \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/petsc.git