diff --git a/Make/Make.inc.g95 b/Make/Make.inc.g95
index 1182d709..b1eea43a 100644
--- a/Make/Make.inc.g95
+++ b/Make/Make.inc.g95
@@ -42,21 +42,17 @@ BLACS=-lmpiblacsg95 -L$(HOME)/LIB
 
 #######################  Section 4 #######################
 #  Other useful tools&defines                            #
-#  SLU and UMF need only be set when using MLD2P4        #
 ##########################################################
-#SLUDIR=/usr/local/SuperLU_3.0
-#SLU=-lslu_lx_g95 -L$(SLUDIR)
-#SLUDistDIR=/usr/local/SLUDist_2.0
-#SLUDist=-lslud-g95 -L$(SLUDistDIR) -L $(HOME)/LIB
-#SLUDEF=-DHave_SLU_ -I$(SLUDIR) -DHave_SLUDist_ -I$(SLUDistDIR)
-
-#UMFDIR=$(HOME)/LIB/Umfpack_g95
-#UMF=-lumfpack -lamd -L$(UMFDIR)
-#UMFDEF=-DHave_UMF_ -I$(UMFDIR)
+#
+#  We are using the public domain tool METIS from U. Minnesota. To get it
+#  check URL http://www.cs.umn.edu:~karypis
+#  
+METIS_LIB = -L$(HOME)/NUMERICAL/metis-4.0 -lmetis 
+PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB)
 
 #  Add -DLargeFptr for 64-bit addresses
-CDEFINES=-DAdd_ $(SLUDEF) $(UMFDEF)
-FDEFINES=-DNETLIB_BLACS  $(MPI_FINC) -DHAVE_MOVE_ALLOC
+PSBCDEFINES=-DAdd_ 
+PSBFDEFINES=-DNETLIB_BLACS  $(MPI_FINC) -DHAVE_MOVE_ALLOC
 
 AR=ar -cur
 RANLIB=ranlib
@@ -72,6 +68,9 @@ PRECLIBNAME=libpsb_prec.a
 METHDLIBNAME=libpsb_krylov.a
 UTILLIBNAME=libpsb_util.a
 
+CDEFINES=$(PSBCDEFINES)
+FDEFINES=$(PSBFDEFINES)
+
 # Under Linux/gmake there is a rule interpreting .mod as Modula source! 
 $(.mod).o:
 	
diff --git a/Make/Make.inc.gnu42 b/Make/Make.inc.gnu42
index e80d169c..633ec304 100644
--- a/Make/Make.inc.gnu42
+++ b/Make/Make.inc.gnu42
@@ -25,7 +25,7 @@ FIFLAG=-I
 #  Define your linker and linker flags here              #
 #  Does your MPI provide mpi.mod or mpif.h?              #
 #   MPI_FINC=-DMPI_H  or MPI_FINC=-DMPI_MOD              #
-#  If necessary add an include dir                       #
+#  If necessary add MPIINCDIR                            #
 ##########################################################
 MPIDIR=/usr/local/mpich-gcc42
 MPIBIN=$(MPIDIR)/bin
@@ -46,27 +46,18 @@ BLACS=-lmpiblacs-gcc42 -L$(HOME)/LIB
 
 #######################  Section 4 #######################
 #  Other useful tools&defines                            #
-#  SLU and UMF need only be set when using MLD2P4        #
 ##########################################################
-#SLUDIR=/usr/local/SuperLU_3.0
-#SLU=-lslu_lx_gcc42 -L$(SLUDIR)
-#SLUDistDIR=/usr/local/SLUDist_2.0
-#SLUDist=-lslud-gcc42 -L$(SLUDistDIR) -L $(HOME)/LIB
-#SLUDEF=-DHave_SLU_ -I$(SLUDIR) -DHave_SLUDist_ -I$(SLUDistDIR)
-#
-#UMFDIR=$(HOME)/LIB/Umfpack_gcc41
-#UMF=-lumfpack -lamd -L$(UMFDIR)
-#UMFDEF=-DHave_UMF_ -I$(UMFDIR)
 #
 #  We are using the public domain tool METIS from U. Minnesota. To get it
 #  check URL http://www.cs.umn.edu:~karypis
 #  
 METIS_LIB = -L$(HOME)/NUMERICAL/metis-4.0 -lmetis 
-LDLIBS=$(BLACS) $(SLU) $(SLUDist) $(UMF) $(BLAS) $(METIS_LIB)
+PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB)
 
 #  Add -DLargeFptr for 64-bit addresses
-CDEFINES=-DAdd_ $(SLUDEF) $(UMFDEF)
-FDEFINES=-DNETLIB_BLACS  $(MPI_FINC) -DHAVE_MOVE_ALLOC
+PSBCDEFINES=-DAdd_ 
+PSBFDEFINES=-DNETLIB_BLACS  $(MPI_FINC) -DHAVE_MOVE_ALLOC
+
 
 AR=ar -cur
 RANLIB=ranlib
@@ -82,6 +73,9 @@ PRECLIBNAME=libpsb_prec.a
 METHDLIBNAME=libpsb_krylov.a
 UTILLIBNAME=libpsb_util.a
 
+CDEFINES=$(PSBCDEFINES)
+FDEFINES=$(PSBFDEFINES)
+
 # Under Linux/gmake there is a rule interpreting .mod as Modula source! 
 $(.mod).o:
 	
@@ -90,13 +84,13 @@ $(.mod).o:
 .f.o:
 	$(FC) $(FCOPT) $(FINCLUDES)  -c $<
 .f$(.mod):
-	$(F90) $(FCOPT) $(FINCLUDES) -c $<
+	$(FC) $(FCOPT) $(FINCLUDES) -c $<
 .f90$(.mod):
 	$(F90) $(F90COPT) $(FINCLUDES) -c $<
 .f90.o:
 	$(F90) $(F90COPT) $(FINCLUDES) -c $<
 .F.o:
-	$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
+	$(FC) $(FCOPT) $(FINCLUDES) $(FDEFINES) -c $<
 .F90.o:
 	$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
 .F90$(.mod):
diff --git a/Make/Make.inc.gnu42-serialmpi b/Make/Make.inc.gnu42-serialmpi
index 95a5feb9..2c635430 100644
--- a/Make/Make.inc.gnu42-serialmpi
+++ b/Make/Make.inc.gnu42-serialmpi
@@ -45,25 +45,17 @@ EXTRA_COBJS=fakempi.o
 
 #######################  Section 4 #######################
 #  Other useful tools&defines                            #
-#  SLU and UMF need only be set when using MLD2P4        #
 ##########################################################
-#SLUDIR=/usr/local/SuperLU_3.0
-#SLU=-lslu_lx_gcc42 -L$(SLUDIR)
-#SLUDEF=-DHave_SLU_ -I$(SLUDIR)
-
-#UMFDIR=$(HOME)/LIB/Umfpack_gcc41
-#UMF=-lumfpack -lamd -L$(UMFDIR)
-#UMFDEF=-DHave_UMF_ -I$(UMFDIR)
 #
 #  We are using the public domain tool METIS from U. Minnesota. To get it
 #  check URL http://www.cs.umn.edu:~karypis
 #  
 METIS_LIB = -L$(HOME)/NUMERICAL/metis-4.0 -lmetis 
-LDLIBS=$(BLACS) $(SLU) $(UMF) $(BLAS) $(METIS_LIB)
+PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB)
 
 #  Add -DLargeFptr for 64-bit addresses
-CDEFINES=-DAdd_ $(SLUDEF) $(UMFDEF)
-FDEFINES=-DHAVE_MOVE_ALLOC -DSERIAL_MPI  $(MPI_FINC)
+PSBCDEFINES=-DAdd_ 
+PSBFDEFINES=-DHAVE_MOVE_ALLOC -DSERIAL_MPI  $(MPI_FINC)
 
 AR=ar -cur
 RANLIB=ranlib
@@ -79,6 +71,9 @@ PRECLIBNAME=libpsb_prec.a
 METHDLIBNAME=libpsb_krylov.a
 UTILLIBNAME=libpsb_util.a
 
+CDEFINES=$(PSBCDEFINES)
+FDEFINES=$(PSBFDEFINES)
+
 # Under Linux/gmake there is a rule interpreting .mod as Modula source! 
 $(.mod).o:
 	
@@ -87,13 +82,13 @@ $(.mod).o:
 .f.o:
 	$(FC) $(FCOPT) $(FINCLUDES)  -c $<
 .f$(.mod):
-	$(F90) $(FCOPT) $(FINCLUDES) -c $<
+	$(FC) $(FCOPT) $(FINCLUDES) -c $<
 .f90$(.mod):
 	$(F90) $(F90COPT) $(FINCLUDES) -c $<
 .f90.o:
 	$(F90) $(F90COPT) $(FINCLUDES) -c $<
 .F.o:
-	$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
+	$(FC) $(FCOPT) $(FINCLUDES) $(FDEFINES) -c $<
 .F90.o:
 	$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
 .F90$(.mod):
diff --git a/Make/Make.inc.gnu43 b/Make/Make.inc.gnu43
index 02a3ecb0..4850fd65 100644
--- a/Make/Make.inc.gnu43
+++ b/Make/Make.inc.gnu43
@@ -25,7 +25,7 @@ FIFLAG=-I
 #  Define your linker and linker flags here              #
 #  Does your MPI provide mpi.mod or mpif.h?              #
 #   MPI_FINC=-DMPI_H  or MPI_FINC=-DMPI_MOD              #
-#  If necessary add an include dir                       #
+#  If necessary add MPIINCDIR                            #
 ##########################################################
 MPIDIR=/usr/local/mpich-gcc43
 MPIBIN=$(MPIDIR)/bin
@@ -46,27 +46,17 @@ BLACS=-lmpiblacs-gcc42 -L$(HOME)/LIB
 
 #######################  Section 4 #######################
 #  Other useful tools&defines                            #
-#  SLU and UMF need only be set when using MLD2P4        #
 ##########################################################
-#SLUDIR=/usr/local/SuperLU_3.0
-#SLU=-lslu_lx_gcc42 -L$(SLUDIR)
-#SLUDistDIR=/usr/local/SLUDist_2.0
-#SLUDist=-lslud-gcc42 -L$(SLUDistDIR) -L $(HOME)/LIB
-#SLUDEF=-DHave_SLU_ -I$(SLUDIR) -DHave_SLUDist_ -I$(SLUDistDIR)
-#
-#UMFDIR=$(HOME)/LIB/Umfpack_gcc41
-#UMF=-lumfpack -lamd -L$(UMFDIR)
-#UMFDEF=-DHave_UMF_ -I$(UMFDIR)
 #
 #  We are using the public domain tool METIS from U. Minnesota. To get it
 #  check URL http://www.cs.umn.edu:~karypis
 #  
 METIS_LIB = -L$(HOME)/NUMERICAL/metis-4.0 -lmetis 
-LDLIBS=$(BLACS) $(SLU) $(SLUDist) $(UMF) $(BLAS) $(METIS_LIB)
+PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB)
 
 #  Add -DLargeFptr for 64-bit addresses
-CDEFINES=-DAdd_ $(SLUDEF) $(UMFDEF)
-FDEFINES=-DNETLIB_BLACS  $(MPI_FINC) -DHAVE_MOVE_ALLOC
+PSBCDEFINES=-DAdd_ 
+PSBFDEFINES=-DNETLIB_BLACS  $(MPI_FINC) -DHAVE_MOVE_ALLOC
 
 AR=ar -cur
 RANLIB=ranlib
@@ -81,11 +71,9 @@ BASELIBNAME=libpsb_base.a
 PRECLIBNAME=libpsb_prec.a
 METHDLIBNAME=libpsb_krylov.a
 UTILLIBNAME=libpsb_util.a
-CBASELIBNAME=libpsb_base_cbind.a
-CPRECLIBNAME=libpsb_prec_cbind.a
-CMETHDLIBNAME=libpsb_krylov_cbind.a
-CUTILLIBNAME=libpsb_util_cbind.a
 
+CDEFINES=$(PSBCDEFINES)
+FDEFINES=$(PSBFDEFINES)
 
 # Under Linux/gmake there is a rule interpreting .mod as Modula source! 
 $(.mod).o:
@@ -95,13 +83,13 @@ $(.mod).o:
 .f.o:
 	$(FC) $(FCOPT) $(FINCLUDES)  -c $<
 .f$(.mod):
-	$(F90) $(FCOPT) $(FINCLUDES) -c $<
+	$(FC) $(FCOPT) $(FINCLUDES) -c $<
 .f90$(.mod):
 	$(F90) $(F90COPT) $(FINCLUDES) -c $<
 .f90.o:
 	$(F90) $(F90COPT) $(FINCLUDES) -c $<
 .F.o:
-	$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
+	$(FC) $(FCOPT) $(FINCLUDES) $(FDEFINES) -c $<
 .F90.o:
 	$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
 .F90$(.mod):
diff --git a/Make/Make.inc.ifort9 b/Make/Make.inc.ifort9
index 862c2d95..065a9859 100644
--- a/Make/Make.inc.ifort9
+++ b/Make/Make.inc.ifort9
@@ -21,7 +21,6 @@ CCOPT=-O3
 FMFLAG=-I
 FIFLAG=-I
 
-
 #######################  Section 2 #######################
 #  Define your linker and linker flags here              #
 #  Does your MPI provide mpi.mod or mpif.h?              #
@@ -38,7 +37,6 @@ MPCC=$(MPIBIN)/mpicc
 MPI_FINC=-DMPI_MOD
 #$(FIFLAG)/opt/SUNWhpc/include
 
-
 #######################  Section 3 #######################
 #  Specify paths to libraries                            #
 ##########################################################
@@ -49,28 +47,19 @@ BLACS=-lmpiblacs-ifort91 -L$(HOME)/LIB
 
 #######################  Section 4 #######################
 #  Other useful tools&defines                            #
-#  SLU and UMF need only be set when using MLD2P4        #
 ##########################################################
-#SLUDIR=/usr/local/SuperLU_3.0
-#SLU=-lslu_lx_ifc9 -L$(SLUDIR)
-#SLUDistDIR=/usr/local/SLUDist_2.0
-#SLUDist=-lslud-ifc9 -L$(SLUDistDIR) -L $(HOME)/LIB
-#SLUDEF=-DHave_SLU_ -I$(SLUDIR) -DHave_SLUDist_ -I$(SLUDistDIR)
-
-#UMFDIR=$(HOME)/LIB/Umfpack_gcc41
-#UMF=-lumfpack -lamd -L$(UMFDIR)
-#UMFDEF=-DHave_UMF_ -I$(UMFDIR)
 #
 #  We are using the public domain tool METIS from U. Minnesota. To get it
 #  check URL http://www.cs.umn.edu:~karypis
 #  
 METIS_LIB = -L$(HOME)/NUMERICAL/metis-4.0 -lmetis 
-LDLIBS=$(BLACS) $(SLU) $(UMF) $(BLAS) $(METIS_LIB)
+PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB)
 
-#  Add -DLargeFptr for 64-bit addresses 
+#  Add -DLargeFptr for 64-bit addresses
 #   Note: MOVE_ALLOC is only on Intel Fortran 9.1, NOT on 9.0
-CDEFINES=-DAdd_ $(SLUDEF) $(UMFDEF)
-FDEFINES=-DNETLIB_BLACS  $(MPI_FINC) -DHAVE_MOVE_ALLOC
+PSBCDEFINES=-DAdd_ 
+PSBFDEFINES=-DNETLIB_BLACS  $(MPI_FINC) -DHAVE_MOVE_ALLOC
+
 
 AR=ar -cur
 RANLIB=ranlib
@@ -86,6 +75,9 @@ PRECLIBNAME=libpsb_prec.a
 METHDLIBNAME=libpsb_krylov.a
 UTILLIBNAME=libpsb_util.a
 
+CDEFINES=$(PSBCDEFINES)
+FDEFINES=$(PSBFDEFINES)
+
 # Under Linux/gmake there is a rule interpreting .mod as Modula source! 
 $(.mod).o:
 	
diff --git a/Make/Make.inc.sp5 b/Make/Make.inc.sp5
index ef15d302..f4cc555a 100644
--- a/Make/Make.inc.sp5
+++ b/Make/Make.inc.sp5
@@ -21,7 +21,6 @@ CCOPT=-O3
 FMFLAG=-I
 FIFLAG=-I
 
-
 #######################  Section 2 #######################
 #  Define your linker and linker flags here              #
 #  Does your MPI provide mpi.mod or mpif.h?              #
@@ -45,27 +44,17 @@ BLACS=-lblacssmp
 
 #######################  Section 4 #######################
 #  Other useful tools&defines                            #
-#  SLU and UMF need only be set when using MLD2P4        #
 ##########################################################
-#SLUDIR=/usr/local/SuperLU_3.0
-#SLU=-lslu -L$(SLUDIR)
-#SLUDistDIR=/usr/local/SLUDist_2.0
-#SLUDist=-lslud -L$(SLUDistDIR) -L $(HOME)/LIB
-#SLUDEF=-DHave_SLU_ -I$(SLUDIR) -DHave_SLUDist_ -I$(SLUDistDIR)
-
-#UMFDIR=$(HOME)/LIB/Umfpack
-#UMF=-lumfpack -lamd -L$(UMFDIR)
-#UMFDEF=-DHave_UMF_ -I$(UMFDIR)
 #
 #  We are using the public domain tool METIS from U. Minnesota. To get it
 #  check URL http://www.cs.umn.edu:~karypis
 #  
 METIS_LIB = -L$(HOME)/NUMERICAL/metis-4.0 -lmetis 
-LDLIBS=$(BLACS) $(SLU) $(UMF) $(BLAS) $(METIS_LIB)
+PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB)
 
 #  Add -DLargeFptr for 64-bit addresses
-CDEFINES=-DNoChange $(SLUDEF) $(UMFDEF) -DLargeFptr
-FDEFINES=-WF,-DESSL_BLACS  $(MPI_FINC)
+PSBCDEFINES=-DNoChange -DLargeFptr
+PSBFDEFINES=-WF,-DESSL_BLACS  $(MPI_FINC)
 # There's no MOVE_ALLOC yet in XLF 10.1.
 #-WF,-DHAVE_MOVE_ALLOC 
 
@@ -84,6 +73,9 @@ PRECLIBNAME=libpsb_prec.a
 METHDLIBNAME=libpsb_krylov.a
 UTILLIBNAME=libpsb_util.a
 
+CDEFINES=$(PSBCDEFINES)
+FDEFINES=$(PSBFDEFINES)
+
 # Under Linux/gmake there is a rule interpreting .mod as Modula source! 
 $(.mod).o:
 	
@@ -98,7 +90,7 @@ $(.mod).o:
 .f90.o:
 	$(F90) $(F90COPT) $(FINCLUDES) -c $<
 .F.o:
-	$(FC) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
+	$(FC) $(FCOPT) $(FINCLUDES) $(FDEFINES) -c $<
 .F90.o:
 	$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
 .F90$(.mod):
diff --git a/Make/Make.inc.sun-6.2 b/Make/Make.inc.sun-6.2
index 8feecffc..e28840ed 100644
--- a/Make/Make.inc.sun-6.2
+++ b/Make/Make.inc.sun-6.2
@@ -22,12 +22,11 @@ CCOPT=-fast
 FMFLAG=-M
 FIFLAG=-I
 
-
 #######################  Section 2 #######################
 #  Define your linker and linker flags here              #
 #  Does your MPI provide mpi.mod or mpif.h?              #
 #   MPI_FINC=-DMPI_H  or MPI_FINC=-DMPI_MOD              #
-#  If necessary add the include dir                      #
+#  If necessary add MPIINCDIR                            #
 ##########################################################
 F90LINK=mpf90 
 FLINK=mpf90 -lf77compat 
@@ -45,28 +44,19 @@ BLACS=$(HOME)/LIB/libblacs_MPI-SUN4SOL2-0.a $(HOME)/LIB/libblacsCinit_MPI-SUN4SO
 
 #######################  Section 4 #######################
 #  Other useful tools&defines                            #
-#  SLU and UMF need only be set when using MLD2P4        #
 ##########################################################
-SLUDIR=
-SLU=
-SLUDEF=
-#SLUDistDIR=/usr/local/SLUDist_2.0
-#SLUDist=-lslud-gcc42 -L$(SLUDistDIR) -L $(HOME)/LIB
-#SLUDEF=-DHave_SLU_ -I$(SLUDIR) -DHave_SLUDist_ -I$(SLUDistDIR)
-
-UMFDIR=
-UMF=
-UMFDEF=
-
-
+#
+#  We are using the public domain tool METIS from U. Minnesota. To get it
+#  check URL http://www.cs.umn.edu:~karypis
+#  
 METIS_LIB = -L$(HOME)/NUMERICAL/metis-4.0 -lmetis 
-LDLIBS=$(BLACS) $(SLU) $(SLUDist) $(UMF) $(BLAS) $(METIS_LIB)
+PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB)
 
 #  Add -DLargeFptr for 64-bit addresses
 #  SUN compiler does not have MOVE_ALLOC. 
 # -DHAVE_MOVE_ALLOC
-CDEFINES=-DAdd_ $(SLUDEF) $(UMFDEF)
-FDEFINES=-DNETLIB_BLACS  $(MPI_FINC) 
+PSBCDEFINES=-DAdd_ 
+PSBFDEFINES=-DNETLIB_BLACS  $(MPI_FINC) 
 
 AR=ar -cur
 RANLIB=ranlib
@@ -82,6 +72,9 @@ PRECLIBNAME=libpsb_prec.a
 METHDLIBNAME=libpsb_krylov.a
 UTILLIBNAME=libpsb_util.a
 
+CDEFINES=$(PSBCDEFINES)
+FDEFINES=$(PSBFDEFINES)
+
 # Under Linux/gmake there is a rule interpreting .mod as Modula source! 
 $(.mod).o: