merging: Various cleanups to makefiles #84

Contribution by @turboencabulator
Closing #84

49 files changed, 725 insertions, 996 deletions

diff --git a/BLAS/SRC/CMakeLists.txt b/BLAS/SRC/CMakeLists.txt
index 84e85250..a9306fc4 100644
--- a/BLAS/SRC/CMakeLists.txt
+++ b/BLAS/SRC/CMakeLists.txt
@@ -69,7 +69,7 @@ set(DBLAS1 idamax.f dasum.f daxpy.f dcopy.f ddot.f dnrm2.f
 set(ZBLAS1 dcabs1.f dzasum.f dznrm2.f izamax.f zaxpy.f zcopy.f
 	zdotc.f zdotu.f zdscal.f zrotg.f zscal.f zswap.f zdrot.f)
 
-set(CB1AUX  isamax.f sasum.f saxpy.f scopy.f snrm2.f sscal.f)
+set(CB1AUX isamax.f sasum.f saxpy.f scopy.f snrm2.f sscal.f)
 
 set(ZB1AUX idamax.f dasum.f daxpy.f dcopy.f dnrm2.f dscal.f)
 
@@ -78,7 +78,7 @@ set(ZB1AUX idamax.f dasum.f daxpy.f dcopy.f dnrm2.f dscal.f)
 #  Level 2 and Level 3 BLAS.  Comment it out only if you already have
 #  both the Level 2 and 3 BLAS.
 #---------------------------------------------------------------------
-set(ALLBLAS  lsame.f xerbla.f xerbla_array.f)
+set(ALLBLAS lsame.f xerbla.f xerbla_array.f)
 
 #---------------------------------------------------------
 #  Comment out the next 4 definitions if you already have
@@ -104,7 +104,7 @@ set(ZBLAS2 zgemv.f zgbmv.f zhemv.f zhbmv.f zhpmv.f
 #  Comment out the next 4 definitions if you already have
 #  the Level 3 BLAS.
 #---------------------------------------------------------
-set(SBLAS3 sgemm.f ssymm.f ssyrk.f ssyr2k.f strmm.f strsm.f )
+set(SBLAS3 sgemm.f ssymm.f ssyrk.f ssyr2k.f strmm.f strsm.f)
 
 set(CBLAS3 cgemm.f csymm.f csyrk.f csyr2k.f ctrmm.f ctrsm.f
 	chemm.f cherk.f cher2k.f)
@@ -127,11 +127,11 @@ if(BLAS_DOUBLE)
 	${DBLAS2} ${DBLAS3})
 endif()
 if(BLAS_COMPLEX)
-  set(ALLOBJ  ${BLASLIB} ${CBLAS1} ${CB1AUX}
+  set(ALLOBJ ${BLASLIB} ${CBLAS1} ${CB1AUX}
 	${ALLBLAS} ${CBLAS2})
 endif()
 if(BLAS_COMPLEX16)
-  set(ALLOBJ  ${BLASLIB} ${ZBLAS1} ${ZB1AUX}
+  set(ALLOBJ ${BLASLIB} ${ZBLAS1} ${ZB1AUX}
 	${ALLBLAS} ${ZBLAS2} ${ZBLAS3})
 endif()
 
diff --git a/BLAS/SRC/Makefile b/BLAS/SRC/Makefile
index f36e8ad9..47a15824 100644
--- a/BLAS/SRC/Makefile
+++ b/BLAS/SRC/Makefile
@@ -88,8 +88,8 @@ $(ZB1AUX): $(FRC)
 #  Level 2 and Level 3 BLAS.  Comment it out only if you already have
 #  both the Level 2 and 3 BLAS.
 #---------------------------------------------------------------------
-ALLBLAS  = lsame.o xerbla.o xerbla_array.o
-$(ALLBLAS) : $(FRC)
+ALLBLAS = lsame.o xerbla.o xerbla_array.o
+$(ALLBLAS): $(FRC)
 
 #---------------------------------------------------------
 #  Comment out the next 4 definitions if you already have
@@ -133,7 +133,7 @@ ZBLAS3 = zgemm.o zsymm.o zsyrk.o zsyr2k.o ztrmm.o ztrsm.o \
 	zhemm.o zherk.o zher2k.o
 $(ZBLAS3): $(FRC)
 
-ALLOBJ=$(SBLAS1) $(SBLAS2) $(SBLAS3) $(DBLAS1) $(DBLAS2) $(DBLAS3)	\
+ALLOBJ = $(SBLAS1) $(SBLAS2) $(SBLAS3) $(DBLAS1) $(DBLAS2) $(DBLAS3) \
 	$(CBLAS1) $(CBLAS2) $(CBLAS3) $(ZBLAS1) \
 	$(ZBLAS2) $(ZBLAS3) $(ALLBLAS)
 
@@ -168,4 +168,4 @@ clean:
 	rm -f *.o
 
 .f.o:
-	$(FORTRAN) $(OPTS) -c $< -o $@
+	$(FORTRAN) $(OPTS) -c -o $@ $<
diff --git a/BLAS/TESTING/CMakeLists.txt b/BLAS/TESTING/CMakeLists.txt
index e0d9a05b..f88c9a8a 100644
--- a/BLAS/TESTING/CMakeLists.txt
+++ b/BLAS/TESTING/CMakeLists.txt
@@ -37,12 +37,12 @@ macro(add_blas_test name src)
       -DINPUT=${TEST_INPUT}
       -DINTDIR=${CMAKE_CFG_INTDIR}
       -P "${LAPACK_SOURCE_DIR}/TESTING/runtest.cmake")
-    else()
-      add_test(NAME BLAS-${name} COMMAND "${CMAKE_COMMAND}"
-        -DTEST=$<TARGET_FILE:${name}>
-        -DINTDIR=${CMAKE_CFG_INTDIR}
-        -P "${LAPACK_SOURCE_DIR}/TESTING/runtest.cmake")
-    endif()
+  else()
+    add_test(NAME BLAS-${name} COMMAND "${CMAKE_COMMAND}"
+      -DTEST=$<TARGET_FILE:${name}>
+      -DINTDIR=${CMAKE_CFG_INTDIR}
+      -P "${LAPACK_SOURCE_DIR}/TESTING/runtest.cmake")
+  endif()
 endmacro()
 
 if(BUILD_SINGLE)
diff --git a/BLAS/TESTING/Makeblat1 b/BLAS/TESTING/Makeblat1
index 573a2891..ccd7e3c6 100644
--- a/BLAS/TESTING/Makeblat1
+++ b/BLAS/TESTING/Makeblat1
@@ -29,14 +29,11 @@ include ../../make.inc
 #######################################################################
 
 SBLAT1 = sblat1.o
-
 CBLAT1 = cblat1.o
-
 DBLAT1 = dblat1.o
-
 ZBLAT1 = zblat1.o
 
-all:  single double complex complex16
+all: single double complex complex16
 
 single: ../xblat1s
 double: ../xblat1d
@@ -44,20 +41,16 @@ complex: ../xblat1c
 complex16: ../xblat1z
 
 ../xblat1s: $(SBLAT1)
-	$(LOADER) $(LOADOPTS) $(SBLAT1) \
-        $(BLASLIB)  -o ../xblat1s
+	$(LOADER) $(LOADOPTS) -o $@ $(SBLAT1) $(BLASLIB)
 
 ../xblat1c: $(CBLAT1)
-	$(LOADER) $(LOADOPTS) $(CBLAT1) \
-        $(BLASLIB)  -o ../xblat1c
+	$(LOADER) $(LOADOPTS) -o $@ $(CBLAT1) $(BLASLIB)
 
 ../xblat1d: $(DBLAT1)
-	$(LOADER) $(LOADOPTS) $(DBLAT1) \
-        $(BLASLIB)  -o ../xblat1d
+	$(LOADER) $(LOADOPTS) -o $@ $(DBLAT1) $(BLASLIB)
 
 ../xblat1z: $(ZBLAT1)
-	$(LOADER) $(LOADOPTS) $(ZBLAT1) \
-        $(BLASLIB)  -o ../xblat1z
+	$(LOADER) $(LOADOPTS) -o $@ $(ZBLAT1) $(BLASLIB)
 
 $(SBLAT1): $(FRC)
 $(CBLAT1): $(FRC)
@@ -71,4 +64,4 @@ clean:
 	rm -f *.o
 
 .f.o:
-	$(FORTRAN) $(OPTS) -c $< -o $@
+	$(FORTRAN) $(OPTS) -c -o $@ $<
diff --git a/BLAS/TESTING/Makeblat2 b/BLAS/TESTING/Makeblat2
index 2c62684c..92060788 100644
--- a/BLAS/TESTING/Makeblat2
+++ b/BLAS/TESTING/Makeblat2
@@ -29,14 +29,11 @@ include ../../make.inc
 #######################################################################
 
 SBLAT2 = sblat2.o
-
 CBLAT2 = cblat2.o
-
 DBLAT2 = dblat2.o
-
 ZBLAT2 = zblat2.o
 
-all:  single double complex complex16
+all: single double complex complex16
 
 single: ../xblat2s
 double: ../xblat2d
@@ -44,20 +41,16 @@ complex: ../xblat2c
 complex16: ../xblat2z
 
 ../xblat2s: $(SBLAT2)
-	$(LOADER) $(LOADOPTS) $(SBLAT2) \
-        $(BLASLIB)  -o ../xblat2s
+	$(LOADER) $(LOADOPTS) -o $@ $(SBLAT2) $(BLASLIB)
 
 ../xblat2c: $(CBLAT2)
-	$(LOADER) $(LOADOPTS) $(CBLAT2) \
-        $(BLASLIB)  -o ../xblat2c
+	$(LOADER) $(LOADOPTS) -o $@ $(CBLAT2) $(BLASLIB)
 
 ../xblat2d: $(DBLAT2)
-	$(LOADER) $(LOADOPTS) $(DBLAT2) \
-        $(BLASLIB)  -o ../xblat2d
+	$(LOADER) $(LOADOPTS) -o $@ $(DBLAT2) $(BLASLIB)
 
 ../xblat2z: $(ZBLAT2)
-	$(LOADER) $(LOADOPTS) $(ZBLAT2) \
-        $(BLASLIB)  -o ../xblat2z
+	$(LOADER) $(LOADOPTS) -o $@ $(ZBLAT2) $(BLASLIB)
 
 $(SBLAT2): $(FRC)
 $(CBLAT2): $(FRC)
@@ -71,4 +64,4 @@ clean:
 	rm -f *.o
 
 .f.o:
-	$(FORTRAN) $(OPTS) -c $< -o $@
+	$(FORTRAN) $(OPTS) -c -o $@ $<
diff --git a/BLAS/TESTING/Makeblat3 b/BLAS/TESTING/Makeblat3
index 8ee1212a..e454b348 100644
--- a/BLAS/TESTING/Makeblat3
+++ b/BLAS/TESTING/Makeblat3
@@ -29,14 +29,11 @@ include ../../make.inc
 #######################################################################
 
 SBLAT3 = sblat3.o
-
 CBLAT3 = cblat3.o
-
 DBLAT3 = dblat3.o
-
 ZBLAT3 = zblat3.o
 
-all:  single double complex complex16
+all: single double complex complex16
 
 single: ../xblat3s
 double: ../xblat3d
@@ -44,20 +41,16 @@ complex: ../xblat3c
 complex16: ../xblat3z
 
 ../xblat3s: $(SBLAT3)
-	$(LOADER) $(LOADOPTS) $(SBLAT3) \
-        $(BLASLIB) -o ../xblat3s
+	$(LOADER) $(LOADOPTS) -o $@ $(SBLAT3) $(BLASLIB)
 
 ../xblat3c: $(CBLAT3)
-	$(LOADER) $(LOADOPTS) $(CBLAT3) \
-        $(BLASLIB) -o ../xblat3c
+	$(LOADER) $(LOADOPTS) -o $@ $(CBLAT3) $(BLASLIB)
 
 ../xblat3d: $(DBLAT3)
-	$(LOADER) $(LOADOPTS) $(DBLAT3) \
-        $(BLASLIB) -o ../xblat3d
+	$(LOADER) $(LOADOPTS) -o $@ $(DBLAT3) $(BLASLIB)
 
 ../xblat3z: $(ZBLAT3)
-	$(LOADER) $(LOADOPTS) $(ZBLAT3) \
-        $(BLASLIB) -o ../xblat3z
+	$(LOADER) $(LOADOPTS) -o $@ $(ZBLAT3) $(BLASLIB)
 
 $(SBLAT3): $(FRC)
 $(CBLAT3): $(FRC)
@@ -71,4 +64,4 @@ clean:
 	rm -f *.o
 
 .f.o:
-	$(FORTRAN) $(OPTS) -c $< -o $@
+	$(FORTRAN) $(OPTS) -c -o $@ $<
diff --git a/CBLAS/CMakeLists.txt b/CBLAS/CMakeLists.txt
index a17a5ba6..580864fb 100644
--- a/CBLAS/CMakeLists.txt
+++ b/CBLAS/CMakeLists.txt
@@ -7,16 +7,16 @@ set(LAPACK_INSTALL_EXPORT_NAME cblas-targets)
 include(FortranCInterface)
 ## Ensure that the fortran compiler and c compiler specified are compatible
 FortranCInterface_VERIFY()
-FortranCInterface_HEADER( ${LAPACK_BINARY_DIR}/include/cblas_mangling.h
-                          MACRO_NAMESPACE "F77_"
-                          SYMBOL_NAMESPACE "F77_" )
-if( NOT FortranCInterface_GLOBAL_FOUND OR NOT FortranCInterface_MODULE_FOUND)
+FortranCInterface_HEADER(${LAPACK_BINARY_DIR}/include/cblas_mangling.h
+                         MACRO_NAMESPACE "F77_"
+                         SYMBOL_NAMESPACE "F77_")
+if(NOT FortranCInterface_GLOBAL_FOUND OR NOT FortranCInterface_MODULE_FOUND)
   message(WARNING "Reverting to pre-defined include/lapacke_mangling.h")
-  configure_file( include/lapacke_mangling_with_flags.h.in
-                  ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h )
-endif ()
+  configure_file(include/lapacke_mangling_with_flags.h.in
+                 ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h)
+endif()
 
-include_directories( include ${LAPACK_BINARY_DIR}/include )
+include_directories(include ${LAPACK_BINARY_DIR}/include)
 add_subdirectory(include)
 add_subdirectory(src)
 
@@ -28,12 +28,12 @@ endforeach()
 endmacro()
 
 append_subdir_files(CBLAS_INCLUDE "include")
-install( FILES ${CBLAS_INCLUDE} ${LAPACK_BINARY_DIR}/include/cblas_mangling.h DESTINATION include )
+install(FILES ${CBLAS_INCLUDE} ${LAPACK_BINARY_DIR}/include/cblas_mangling.h DESTINATION include)
 
 # --------------------------------------------------
 if(BUILD_TESTING)
-   add_subdirectory(testing)
-   add_subdirectory(examples)
+  add_subdirectory(testing)
+  add_subdirectory(examples)
 endif()
 
 if(NOT BLAS_FOUND)
@@ -71,7 +71,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in ${CMAKE_CURRENT_BINARY_DI
   install(FILES
   ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc
   DESTINATION ${PKG_CONFIG_DIR}
-   )
+  )
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/cblas-config-install.cmake.in
   ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/cblas-config.cmake @ONLY)
@@ -83,4 +83,3 @@ install(FILES
 
 #install(EXPORT cblas-targets
 #  DESTINATION ${LIBRARY_DIR}/cmake/cblas-${LAPACK_VERSION})
-
diff --git a/CBLAS/Makefile b/CBLAS/Makefile
index c4ab4e87..5a398f80 100644
--- a/CBLAS/Makefile
+++ b/CBLAS/Makefile
@@ -24,4 +24,4 @@ runtst:
 	cd testing && $(MAKE) run
 
 example: all
-	cd examples && make all
+	cd examples && $(MAKE) all
diff --git a/CBLAS/Makefile.in b/CBLAS/Makefile.in
deleted file mode 100644
index 8fb9d139..00000000
--- a/CBLAS/Makefile.in
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Makefile.LINUX
-#
-#
-# If you compile, change the name to Makefile.in.
-#
-#
-
-#-----------------------------------------------------------------------------
-# Shell
-#-----------------------------------------------------------------------------
-
-SHELL = /bin/sh
-
-#-----------------------------------------------------------------------------
-# Platform
-#-----------------------------------------------------------------------------
-
-PLAT = LINUX
-
-#-----------------------------------------------------------------------------
-# Libraries and includes
-#-----------------------------------------------------------------------------
-
-BLLIB = $(home)/lib/librefblas.a
-CBLIB = ../lib/libcblas.a
-
-#-----------------------------------------------------------------------------
-# Compilers
-#-----------------------------------------------------------------------------
-
-CC = gcc
-FC = gfortran
-LOADER = $(FC)
-
-#-----------------------------------------------------------------------------
-# Flags for Compilers
-#-----------------------------------------------------------------------------
-
-CFLAGS = -O3 -DADD_
-FFLAGS = -O3
-
-#-----------------------------------------------------------------------------
-# Archive programs and flags
-#-----------------------------------------------------------------------------
-
-ARCH = ar
-ARCHFLAGS = cr
-RANLIB = ranlib
diff --git a/CBLAS/cmake/tmp.jIUCyIMYeG b/CBLAS/cmake/tmp.jIUCyIMYeG
deleted file mode 100644
index e69de29b..00000000
--- a/CBLAS/cmake/tmp.jIUCyIMYeG
+++ /dev/null
diff --git a/CBLAS/examples/CMakeLists.txt b/CBLAS/examples/CMakeLists.txt
index 85d8bbe6..a4bab6be 100644
--- a/CBLAS/examples/CMakeLists.txt
+++ b/CBLAS/examples/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_executable(xexample1_CBLAS cblas_example1.c )
-add_executable(xexample2_CBLAS cblas_example2.c )
+add_executable(xexample1_CBLAS cblas_example1.c)
+add_executable(xexample2_CBLAS cblas_example2.c)
 
 target_link_libraries(xexample1_CBLAS cblas ${BLAS_LIBRARIES})
 target_link_libraries(xexample2_CBLAS cblas ${BLAS_LIBRARIES})
diff --git a/CBLAS/examples/Makefile b/CBLAS/examples/Makefile
index 61a00c97..1d416a88 100644
--- a/CBLAS/examples/Makefile
+++ b/CBLAS/examples/Makefile
@@ -3,12 +3,12 @@ include ../../make.inc
 all: example1 example2
 
 example1:
-	$(CC) -c $(CFLAGS) -I../include cblas_example1.c
-	$(LOADER) -o cblas_ex1 cblas_example1.o $(CBLASLIB) $(BLASLIB)
+	$(CC) $(CFLAGS) -I../include -c cblas_example1.c
+	$(LOADER) $(LOADOPTS) -o cblas_ex1 cblas_example1.o $(CBLASLIB) $(BLASLIB)
 
 example2:
-	$(CC) -c $(CFLAGS) -I../include cblas_example2.c
-	$(LOADER) -o cblas_ex2 cblas_example2.o $(CBLASLIB) $(BLASLIB)
+	$(CC) $(CFLAGS) -I../include -c cblas_example2.c
+	$(LOADER) $(LOADOPTS) -o cblas_ex2 cblas_example2.o $(CBLASLIB) $(BLASLIB)
 
 cleanall:
 	rm -f *.o cblas_ex1 cblas_ex2
diff --git a/CBLAS/include/CMakeLists.txt b/CBLAS/include/CMakeLists.txt
index a333467a..299b45c9 100644
--- a/CBLAS/include/CMakeLists.txt
+++ b/CBLAS/include/CMakeLists.txt
@@ -1,3 +1,3 @@
-set (CBLAS_INCLUDE cblas.h cblas_f77.h cblas_test.h )
+set(CBLAS_INCLUDE cblas.h cblas_f77.h cblas_test.h)
 
 file(COPY ${CBLAS_INCLUDE} DESTINATION ${LAPACK_BINARY_DIR}/include)
diff --git a/CBLAS/src/CMakeLists.txt b/CBLAS/src/CMakeLists.txt
index 90496b92..20f8eb4c 100644
--- a/CBLAS/src/CMakeLists.txt
+++ b/CBLAS/src/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # Error handling routines for level 2 & 3
 
-set (ERRHAND cblas_globals.c cblas_xerbla.c xerbla.c)
+set(ERRHAND cblas_globals.c cblas_xerbla.c xerbla.c)
 
 #
 #
@@ -15,47 +15,45 @@ set (ERRHAND cblas_globals.c cblas_xerbla.c xerbla.c)
 #
 # All object files for single real precision
 #
-set (SLEV1 cblas_srotg.c cblas_srotmg.c cblas_srot.c cblas_srotm.c
+set(SLEV1 cblas_srotg.c cblas_srotmg.c cblas_srot.c cblas_srotm.c
          cblas_sswap.c cblas_sscal.c  cblas_scopy.c cblas_saxpy.c
          cblas_sdot.c  cblas_sdsdot.c cblas_snrm2.c cblas_sasum.c
-         cblas_isamax.c   sdotsub.f   sdsdotsub.f snrm2sub.f sasumsub.f
+         cblas_isamax.c sdotsub.f sdsdotsub.f snrm2sub.f sasumsub.f
          isamaxsub.f)
+
 #
 # All object files for double real precision
 #
-set (DLEV1 cblas_drotg.c cblas_drotmg.c cblas_drot.c cblas_drotm.c
+set(DLEV1 cblas_drotg.c cblas_drotmg.c cblas_drot.c cblas_drotm.c
          cblas_dswap.c cblas_dscal.c  cblas_dcopy.c cblas_daxpy.c
          cblas_ddot.c  cblas_dsdot.c cblas_dnrm2.c cblas_dasum.c
-         cblas_idamax.c   ddotsub.f   dsdotsub.f       dnrm2sub.f
+         cblas_idamax.c ddotsub.f dsdotsub.f dnrm2sub.f
          dasumsub.f idamaxsub.f)
 
 #
 # All object files for single complex precision
 #
-set (CLEV1 cblas_cswap.c cblas_cscal.c cblas_csscal.c cblas_ccopy.c
+set(CLEV1 cblas_cswap.c cblas_cscal.c cblas_csscal.c cblas_ccopy.c
          cblas_caxpy.c cblas_cdotu_sub.c cblas_cdotc_sub.c
          cblas_icamax.c cdotcsub.f cdotusub.f icamaxsub.f)
 
 #
 # All object files for double complex precision
 #
-set (ZLEV1 cblas_zswap.c cblas_zscal.c cblas_zdscal.c cblas_zcopy.c
+set(ZLEV1 cblas_zswap.c cblas_zscal.c cblas_zdscal.c cblas_zcopy.c
          cblas_zaxpy.c cblas_zdotu_sub.c cblas_zdotc_sub.c cblas_dznrm2.c
          cblas_dzasum.c cblas_izamax.c zdotcsub.f zdotusub.f
-         dzasumsub.f  dznrm2sub.f  izamaxsub.f)
-
+         dzasumsub.f dznrm2sub.f izamaxsub.f)
 
 #
 # Common files for single complex precision
 #
-set (SCLEV1 cblas_scasum.c scasumsub.f cblas_scnrm2.c scnrm2sub.f)
-
+set(SCLEV1 cblas_scasum.c scasumsub.f cblas_scnrm2.c scnrm2sub.f)
 
 #
 # All object files
 #
-set (ALEV1 ${slev1} ${dlev1} ${clev1} ${zlev1} ${sclev1})
-
+set(ALEV1 ${slev1} ${dlev1} ${clev1} ${zlev1} ${sclev1})
 
 #
 #
@@ -68,24 +66,23 @@ set (ALEV1 ${slev1} ${dlev1} ${clev1} ${zlev1} ${sclev1})
 #
 # All object files for single real precision
 #
-set (SLEV2 cblas_sgemv.c cblas_sgbmv.c cblas_sger.c cblas_ssbmv.c  cblas_sspmv.c
+set(SLEV2 cblas_sgemv.c cblas_sgbmv.c cblas_sger.c  cblas_ssbmv.c cblas_sspmv.c
         cblas_sspr.c  cblas_sspr2.c cblas_ssymv.c cblas_ssyr.c  cblas_ssyr2.c
-        cblas_stbmv.c cblas_stbsv.c cblas_stpmv.c cblas_stpsv.c  cblas_strmv.c
+        cblas_stbmv.c cblas_stbsv.c cblas_stpmv.c cblas_stpsv.c cblas_strmv.c
         cblas_strsv.c)
 
-
 #
 # All object files for double real precision
 #
-set (DLEV2 cblas_dgemv.c cblas_dgbmv.c cblas_dger.c cblas_dsbmv.c  cblas_dspmv.c
+set(DLEV2 cblas_dgemv.c cblas_dgbmv.c cblas_dger.c  cblas_dsbmv.c cblas_dspmv.c
         cblas_dspr.c  cblas_dspr2.c cblas_dsymv.c cblas_dsyr.c  cblas_dsyr2.c
-        cblas_dtbmv.c cblas_dtbsv.c cblas_dtpmv.c cblas_dtpsv.c  cblas_dtrmv.c
+        cblas_dtbmv.c cblas_dtbsv.c cblas_dtpmv.c cblas_dtpsv.c cblas_dtrmv.c
         cblas_dtrsv.c)
 
 #
 # All object files for single complex precision
 #
-set (CLEV2 cblas_cgemv.c cblas_cgbmv.c cblas_chemv.c cblas_chbmv.c cblas_chpmv.c
+set(CLEV2 cblas_cgemv.c cblas_cgbmv.c cblas_chemv.c cblas_chbmv.c cblas_chpmv.c
         cblas_ctrmv.c cblas_ctbmv.c cblas_ctpmv.c cblas_ctrsv.c cblas_ctbsv.c
         cblas_ctpsv.c cblas_cgeru.c cblas_cgerc.c cblas_cher.c  cblas_cher2.c
         cblas_chpr.c  cblas_chpr2.c)
@@ -93,14 +90,15 @@ set (CLEV2 cblas_cgemv.c cblas_cgbmv.c cblas_chemv.c cblas_chbmv.c cblas_chpmv.c
 #
 # All object files for double complex precision
 #
-set (ZLEV2 cblas_zgemv.c cblas_zgbmv.c cblas_zhemv.c cblas_zhbmv.c cblas_zhpmv.c
+set(ZLEV2 cblas_zgemv.c cblas_zgbmv.c cblas_zhemv.c cblas_zhbmv.c cblas_zhpmv.c
         cblas_ztrmv.c cblas_ztbmv.c cblas_ztpmv.c cblas_ztrsv.c cblas_ztbsv.c
         cblas_ztpsv.c cblas_zgeru.c cblas_zgerc.c cblas_zher.c  cblas_zher2.c
         cblas_zhpr.c  cblas_zhpr2.c)
+
 #
 # All object files
 #
-set (AVEL2 ${slev2} ${dlev2} ${clev2} ${zlev2})
+set(AVEL2 ${slev2} ${dlev2} ${clev2} ${zlev2})
 
 #
 #
@@ -113,56 +111,60 @@ set (AVEL2 ${slev2} ${dlev2} ${clev2} ${zlev2})
 #
 # All object files for single real precision
 #
-set (SLEV3 cblas_sgemm.c cblas_ssymm.c cblas_ssyrk.c cblas_ssyr2k.c cblas_strmm.c
+set(SLEV3 cblas_sgemm.c cblas_ssymm.c cblas_ssyrk.c cblas_ssyr2k.c cblas_strmm.c
         cblas_strsm.c)
+
 #
 # All object files for double real precision
 #
-set (DLEV3 cblas_dgemm.c cblas_dsymm.c cblas_dsyrk.c cblas_dsyr2k.c cblas_dtrmm.c
+set(DLEV3 cblas_dgemm.c cblas_dsymm.c cblas_dsyrk.c cblas_dsyr2k.c cblas_dtrmm.c
         cblas_dtrsm.c)
+
 #
 # All object files for single complex precision
 #
-set (CLEV3 cblas_cgemm.c cblas_csymm.c cblas_chemm.c cblas_cherk.c
-        cblas_cher2k.c cblas_ctrmm.c cblas_ctrsm.c  cblas_csyrk.c
+set(CLEV3 cblas_cgemm.c cblas_csymm.c cblas_chemm.c cblas_cherk.c
+        cblas_cher2k.c cblas_ctrmm.c cblas_ctrsm.c cblas_csyrk.c
         cblas_csyr2k.c)
+
 #
 # All object files for double complex precision
 #
-set (ZLEV3 cblas_zgemm.c cblas_zsymm.c cblas_zhemm.c cblas_zherk.c
-        cblas_zher2k.c cblas_ztrmm.c cblas_ztrsm.c  cblas_zsyrk.c
+set(ZLEV3 cblas_zgemm.c cblas_zsymm.c cblas_zhemm.c cblas_zherk.c
+        cblas_zher2k.c cblas_ztrmm.c cblas_ztrsm.c cblas_zsyrk.c
         cblas_zsyr2k.c)
+
 #
 # All object files
 #
-set (ALEV3 ${slev3} ${dlev3} ${clev3} ${zlev3})
+set(ALEV3 ${slev3} ${dlev3} ${clev3} ${zlev3})
 
 # default build all of it
 set(ALLOBJ ${SCLEV1} ${SLEV1} ${SLEV2} ${SLEV3} ${ERRHAND}
            ${DLEV1} ${DLEV2} ${DLEV3}
            ${CLEV1} ${CLEV2} ${CLEV3}
-           ${ZLEV1} ${ZLEV2} ${ZLEV3}   )
+           ${ZLEV1} ${ZLEV2} ${ZLEV3})
 
 # Single real precision
 if(CBLAS_SINGLE)
- set(ALLOBJ ${SCLEV1} ${SLEV1} ${SLEV2} ${SLEV3} ${ERRHAND})
+  set(ALLOBJ ${SCLEV1} ${SLEV1} ${SLEV2} ${SLEV3} ${ERRHAND})
 endif()
 
 # Double real precision
 if(CBLAS_DOUBLE)
- set(ALLOBJ  ${DLEV1} ${DLEV2} ${DLEV3} ${ERRHAND})
+  set(ALLOBJ ${DLEV1} ${DLEV2} ${DLEV3} ${ERRHAND})
 endif()
 
 # Single complex precision
-if (CBLAS_COMPLEX)
- set(ALLOBJ  ${CLEV1} ${SCLEV1} ${CLEV2} ${CLEV3} ${ERRHAND})
+if(CBLAS_COMPLEX)
+  set(ALLOBJ ${CLEV1} ${SCLEV1} ${CLEV2} ${CLEV3} ${ERRHAND})
 endif()
 
 # Double complex precision
-if (CBLAS_COMPLEX16)
- set(ALLOBJ  ${ZLEV1} ${ZLEV2} ${ZLEV3} ${ERRHAND})
+if(CBLAS_COMPLEX16)
+  set(ALLOBJ ${ZLEV1} ${ZLEV2} ${ZLEV3} ${ERRHAND})
 endif()
 
 add_library(cblas ${ALLOBJ})
-target_link_libraries(cblas ${BLAS_LIBRARIES} )
+target_link_libraries(cblas ${BLAS_LIBRARIES})
 lapack_install_library(cblas)
diff --git a/CBLAS/src/Makefile b/CBLAS/src/Makefile
index 30dd476b..1d1a0db8 100644
--- a/CBLAS/src/Makefile
+++ b/CBLAS/src/Makefile
@@ -16,6 +16,7 @@ errhand = cblas_globals.o cblas_xerbla.o xerbla.o
 
 # Object files of all routines
 alev = $(alev1) $(alev2) $(alev3) $(errhand)
+
 #
 #
 # CBLAS routines
@@ -27,34 +28,35 @@ alev = $(alev1) $(alev2) $(alev3) $(errhand)
 #
 # All object files for single real precision
 #
-slev1 = cblas_srotg.o cblas_srotmg.o cblas_srot.o cblas_srotm.o  \
-         cblas_sswap.o cblas_sscal.o  cblas_scopy.o cblas_saxpy.o \
-         cblas_sdot.o  cblas_sdsdot.o cblas_snrm2.o cblas_sasum.o \
-         cblas_isamax.o   sdotsub.o   sdsdotsub.o snrm2sub.o sasumsub.o \
-         isamaxsub.o
+slev1 = cblas_srotg.o cblas_srotmg.o cblas_srot.o  cblas_srotm.o \
+        cblas_sswap.o cblas_sscal.o  cblas_scopy.o cblas_saxpy.o \
+        cblas_sdot.o  cblas_sdsdot.o cblas_snrm2.o cblas_sasum.o \
+        cblas_isamax.o sdotsub.o sdsdotsub.o snrm2sub.o sasumsub.o \
+        isamaxsub.o
+
 #
 # All object files for double real precision
 #
-dlev1 = cblas_drotg.o cblas_drotmg.o cblas_drot.o cblas_drotm.o  \
-         cblas_dswap.o cblas_dscal.o  cblas_dcopy.o cblas_daxpy.o \
-         cblas_ddot.o  cblas_dsdot.o cblas_dnrm2.o cblas_dasum.o  \
-         cblas_idamax.o   ddotsub.o   dsdotsub.o       dnrm2sub.o \
-         dasumsub.o idamaxsub.o
+dlev1 = cblas_drotg.o cblas_drotmg.o cblas_drot.o  cblas_drotm.o \
+        cblas_dswap.o cblas_dscal.o  cblas_dcopy.o cblas_daxpy.o \
+        cblas_ddot.o  cblas_dsdot.o  cblas_dnrm2.o cblas_dasum.o \
+        cblas_idamax.o ddotsub.o dsdotsub.o dnrm2sub.o \
+        dasumsub.o idamaxsub.o
 
 #
 # All object files for single complex precision
 #
 clev1 = cblas_cswap.o cblas_cscal.o cblas_csscal.o cblas_ccopy.o \
-         cblas_caxpy.o cblas_cdotu_sub.o cblas_cdotc_sub.o \
-         cblas_icamax.o cdotcsub.o cdotusub.o icamaxsub.o
+        cblas_caxpy.o cblas_cdotu_sub.o cblas_cdotc_sub.o \
+        cblas_icamax.o cdotcsub.o cdotusub.o icamaxsub.o
 
 #
 # All object files for double complex precision
 #
 zlev1 = cblas_zswap.o cblas_zscal.o cblas_zdscal.o cblas_zcopy.o \
-         cblas_zaxpy.o cblas_zdotu_sub.o cblas_zdotc_sub.o cblas_dznrm2.o \
-         cblas_dzasum.o cblas_izamax.o zdotcsub.o zdotusub.o      \
-         dzasumsub.o  dznrm2sub.o  izamaxsub.o
+        cblas_zaxpy.o cblas_zdotu_sub.o cblas_zdotc_sub.o cblas_dznrm2.o \
+        cblas_dzasum.o cblas_izamax.o zdotcsub.o zdotusub.o \
+        dzasumsub.o dznrm2sub.o izamaxsub.o
 
 #
 # Common files for single / complex precision
@@ -66,7 +68,6 @@ sclev1 = cblas_scasum.o scasumsub.o cblas_scnrm2.o scnrm2sub.o
 #
 alev1 = $(slev1) $(dlev1) $(clev1) $(zlev1) $(sclev1)
 
-
 #
 # Make an archive file
 #
@@ -92,8 +93,8 @@ zlib1: $(zlev1)
 	$(RANLIB) $(CBLASLIB)
 
 # All precisions
-all1:  $(alev1)
-	$(ARCH) $(ARCHFLAGS)  $(CBLASLIB) $(alev1)
+all1: $(alev1)
+	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(alev1)
 	$(RANLIB) $(CBLASLIB)
 
 #
@@ -107,17 +108,17 @@ all1:  $(alev1)
 #
 # All object files for single real precision
 #
-slev2 = cblas_sgemv.o cblas_sgbmv.o cblas_sger.o cblas_ssbmv.o  cblas_sspmv.o \
+slev2 = cblas_sgemv.o cblas_sgbmv.o cblas_sger.o  cblas_ssbmv.o cblas_sspmv.o \
         cblas_sspr.o  cblas_sspr2.o cblas_ssymv.o cblas_ssyr.o  cblas_ssyr2.o \
-        cblas_stbmv.o cblas_stbsv.o cblas_stpmv.o cblas_stpsv.o  cblas_strmv.o \
+        cblas_stbmv.o cblas_stbsv.o cblas_stpmv.o cblas_stpsv.o cblas_strmv.o \
         cblas_strsv.o
 
 #
 # All object files for double real precision
 #
-dlev2 = cblas_dgemv.o cblas_dgbmv.o cblas_dger.o cblas_dsbmv.o  cblas_dspmv.o \
+dlev2 = cblas_dgemv.o cblas_dgbmv.o cblas_dger.o  cblas_dsbmv.o cblas_dspmv.o \
         cblas_dspr.o  cblas_dspr2.o cblas_dsymv.o cblas_dsyr.o  cblas_dsyr2.o \
-        cblas_dtbmv.o cblas_dtbsv.o cblas_dtpmv.o cblas_dtpsv.o  cblas_dtrmv.o \
+        cblas_dtbmv.o cblas_dtbsv.o cblas_dtpmv.o cblas_dtpsv.o cblas_dtrmv.o \
         cblas_dtrsv.o
 
 #
@@ -135,6 +136,7 @@ zlev2 = cblas_zgemv.o cblas_zgbmv.o cblas_zhemv.o cblas_zhbmv.o cblas_zhpmv.o \
         cblas_ztrmv.o cblas_ztbmv.o cblas_ztpmv.o cblas_ztrsv.o cblas_ztbsv.o \
         cblas_ztpsv.o cblas_zgeru.o cblas_zgerc.o cblas_zher.o  cblas_zher2.o \
         cblas_zhpr.o  cblas_zhpr2.o
+
 #
 # All object files
 #
@@ -149,7 +151,7 @@ slib2: $(slev2) $(errhand)
 	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(slev2) $(errhand)
 	$(RANLIB) $(CBLASLIB)
 
-# Double real  precision
+# Double real precision
 dlib2: $(dlev2) $(errhand)
 	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(dlev2) $(errhand)
 	$(RANLIB) $(CBLASLIB)
@@ -165,9 +167,10 @@ zlib2: $(zlev2) $(errhand)
 	$(RANLIB) $(CBLASLIB)
 
 # All precisions
-all2:  $(alev2) $(errhand)
-	$(ARCH) $(ARCHFLAGS)  $(CBLASLIB) $(alev2) $(errhand)
+all2: $(alev2) $(errhand)
+	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(alev2) $(errhand)
 	$(RANLIB) $(CBLASLIB)
+
 #
 #
 # CBLAS routines
@@ -179,27 +182,29 @@ all2:  $(alev2) $(errhand)
 #
 # All object files for single real precision
 #
-slev3 = cblas_sgemm.o cblas_ssymm.o cblas_ssyrk.o cblas_ssyr2k.o cblas_strmm.o\
+slev3 = cblas_sgemm.o cblas_ssymm.o cblas_ssyrk.o cblas_ssyr2k.o cblas_strmm.o \
         cblas_strsm.o
 
 #
 # All object files for double real precision
 #
-dlev3 = cblas_dgemm.o cblas_dsymm.o cblas_dsyrk.o cblas_dsyr2k.o cblas_dtrmm.o\
+dlev3 = cblas_dgemm.o cblas_dsymm.o cblas_dsyrk.o cblas_dsyr2k.o cblas_dtrmm.o \
         cblas_dtrsm.o
 
 #
 # All object files for single complex precision
 #
-clev3 = cblas_cgemm.o cblas_csymm.o cblas_chemm.o cblas_cherk.o\
-        cblas_cher2k.o cblas_ctrmm.o cblas_ctrsm.o  cblas_csyrk.o\
+clev3 = cblas_cgemm.o cblas_csymm.o cblas_chemm.o cblas_cherk.o \
+        cblas_cher2k.o cblas_ctrmm.o cblas_ctrsm.o cblas_csyrk.o \
         cblas_csyr2k.o
+
 #
 # All object files for double complex precision
 #
-zlev3 = cblas_zgemm.o cblas_zsymm.o cblas_zhemm.o cblas_zherk.o\
-        cblas_zher2k.o cblas_ztrmm.o cblas_ztrsm.o  cblas_zsyrk.o\
+zlev3 = cblas_zgemm.o cblas_zsymm.o cblas_zhemm.o cblas_zherk.o \
+        cblas_zher2k.o cblas_ztrmm.o cblas_ztrsm.o cblas_zsyrk.o \
         cblas_zsyr2k.o
+
 #
 # All object files
 #
@@ -230,20 +235,20 @@ zlib3: $(zlev3) $(errhand)
 	$(RANLIB) $(CBLASLIB)
 
 # All precisions
-all3:  $(alev3) $(errhand)
+all3: $(alev3) $(errhand)
 	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(alev3)
 	$(RANLIB) $(CBLASLIB)
 
 # All levels and precisions
 cblaslib: $(alev)
-	$(ARCH) $(ARCHFLAGS)  $(CBLASLIB) $(alev)
+	$(ARCH) $(ARCHFLAGS) $(CBLASLIB) $(alev)
 	$(RANLIB) $(CBLASLIB)
 
 FRC:
 	@FRC=$(FRC)
 
 .c.o:
-	$(CC) -c $(CFLAGS) -I ../include -o $@ $<
+	$(CC) $(CFLAGS) -I../include -c -o $@ $<
 
 .f.o:
-	$(FORTRAN) $(OPTS) -c $< -o $@
+	$(FORTRAN) $(OPTS) -c -o $@ $<
diff --git a/CBLAS/testing/CMakeLists.txt b/CBLAS/testing/CMakeLists.txt
index c6073547..fe9a51e1 100644
--- a/CBLAS/testing/CMakeLists.txt
+++ b/CBLAS/testing/CMakeLists.txt
@@ -15,35 +15,35 @@ macro(add_cblas_test output input target)
       -DOUTPUT=${TEST_OUTPUT}
       -DINTDIR=${CMAKE_CFG_INTDIR}
       -P "${LAPACK_SOURCE_DIR}/TESTING/runtest.cmake")
-    else()
-      add_test(NAME CBLAS-${testName} COMMAND "${CMAKE_COMMAND}"
-        -DTEST=$<TARGET_FILE:${target}>
-        -DOUTPUT=${TEST_OUTPUT}
-        -DINTDIR=${CMAKE_CFG_INTDIR}
-        -P "${LAPACK_SOURCE_DIR}/TESTING/runtest.cmake")
-    endif()
+  else()
+    add_test(NAME CBLAS-${testName} COMMAND "${CMAKE_COMMAND}"
+      -DTEST=$<TARGET_FILE:${target}>
+      -DOUTPUT=${TEST_OUTPUT}
+      -DINTDIR=${CMAKE_CFG_INTDIR}
+      -P "${LAPACK_SOURCE_DIR}/TESTING/runtest.cmake")
+  endif()
 endmacro()
 
 
 # Object files for single real precision
-set( STESTL1O c_sblas1.c)
-set( STESTL2O c_sblas2.c c_s2chke.c auxiliary.c c_xerbla.c)
-set( STESTL3O c_sblas3.c c_s3chke.c auxiliary.c c_xerbla.c)
+set(STESTL1O c_sblas1.c)
+set(STESTL2O c_sblas2.c c_s2chke.c auxiliary.c c_xerbla.c)
+set(STESTL3O c_sblas3.c c_s3chke.c auxiliary.c c_xerbla.c)
 
 # Object files for double real precision
-set( DTESTL1O  c_dblas1.c)
-set( DTESTL2O  c_dblas2.c c_d2chke.c auxiliary.c c_xerbla.c)
-set( DTESTL3O  c_dblas3.c c_d3chke.c auxiliary.c c_xerbla.c)
+set(DTESTL1O c_dblas1.c)
+set(DTESTL2O c_dblas2.c c_d2chke.c auxiliary.c c_xerbla.c)
+set(DTESTL3O c_dblas3.c c_d3chke.c auxiliary.c c_xerbla.c)
 
 # Object files for single complex precision
-set( CTESTL1O  c_cblat1.f c_cblas1.c)
-set( CTESTL2O  c_cblas2.c c_c2chke.c auxiliary.c c_xerbla.c)
-set( CTESTL3O  c_cblas3.c c_c3chke.c auxiliary.c c_xerbla.c)
+set(CTESTL1O c_cblat1.f c_cblas1.c)
+set(CTESTL2O c_cblas2.c c_c2chke.c auxiliary.c c_xerbla.c)
+set(CTESTL3O c_cblas3.c c_c3chke.c auxiliary.c c_xerbla.c)
 
 # Object files for double complex precision
-set( ZTESTL1O  c_zblas1.c)
-set( ZTESTL2O  c_zblas2.c c_z2chke.c auxiliary.c c_xerbla.c)
-set( ZTESTL3O  c_zblas3.c c_z3chke.c auxiliary.c c_xerbla.c)
+set(ZTESTL1O c_zblas1.c)
+set(ZTESTL2O c_zblas2.c c_z2chke.c auxiliary.c c_xerbla.c)
+set(ZTESTL3O c_zblas3.c c_z3chke.c auxiliary.c c_xerbla.c)
 
 
 
@@ -59,11 +59,9 @@ if(BUILD_SINGLE)
   add_cblas_test(stest1.out ""   xscblat1)
   add_cblas_test(stest2.out sin2 xscblat2)
   add_cblas_test(stest3.out sin3 xscblat3)
-
 endif()
 
 if(BUILD_DOUBLE)
-
   add_executable(xdcblat1 c_dblat1.f ${DTESTL1O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
   add_executable(xdcblat2 c_dblat2.f ${DTESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
   add_executable(xdcblat3 c_dblat3.f ${DTESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
@@ -75,11 +73,9 @@ if(BUILD_DOUBLE)
   add_cblas_test(dtest1.out ""   xdcblat1)
   add_cblas_test(dtest2.out din2 xdcblat2)
   add_cblas_test(dtest3.out din3 xdcblat3)
-
 endif()
 
 if(BUILD_COMPLEX)
-
   add_executable(xccblat1 c_cblat1.f ${CTESTL1O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
   add_executable(xccblat2 c_cblat2.f ${CTESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
   add_executable(xccblat3 c_cblat3.f ${CTESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
@@ -91,11 +87,9 @@ if(BUILD_COMPLEX)
   add_cblas_test(ctest1.out ""   xccblat1)
   add_cblas_test(ctest2.out cin2 xccblat2)
   add_cblas_test(ctest3.out cin3 xccblat3)
-
 endif()
 
 if(BUILD_COMPLEX16)
-
   add_executable(xzcblat1 c_zblat1.f ${ZTESTL1O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
   add_executable(xzcblat2 c_zblat2.f ${ZTESTL2O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
   add_executable(xzcblat3 c_zblat3.f ${ZTESTL3O} ${LAPACK_BINARY_DIR}/include/cblas_test.h)
@@ -107,5 +101,4 @@ if(BUILD_COMPLEX16)
   add_cblas_test(ztest1.out ""   xzcblat1)
   add_cblas_test(ztest2.out zin2 xzcblat2)
   add_cblas_test(ztest3.out zin3 xzcblat3)
-
 endif()
diff --git a/CBLAS/testing/Makefile b/CBLAS/testing/Makefile
index 4a4ced3e..a5a07837 100644
--- a/CBLAS/testing/Makefile
+++ b/CBLAS/testing/Makefile
@@ -9,30 +9,22 @@ LIB = $(CBLASLIB) $(BLASLIB)
 
 # Object files for single real precision
 stestl1o = c_sblas1.o
-
 stestl2o = c_sblas2.o c_s2chke.o auxiliary.o c_xerbla.o
-
 stestl3o = c_sblas3.o c_s3chke.o auxiliary.o c_xerbla.o
 
 # Object files for double real precision
 dtestl1o = c_dblas1.o
-
 dtestl2o = c_dblas2.o c_d2chke.o auxiliary.o c_xerbla.o
-
 dtestl3o = c_dblas3.o c_d3chke.o auxiliary.o c_xerbla.o
 
 # Object files for single complex precision
 ctestl1o = c_cblas1.o
-
 ctestl2o = c_cblas2.o c_c2chke.o auxiliary.o c_xerbla.o
-
 ctestl3o = c_cblas3.o c_c3chke.o auxiliary.o c_xerbla.o
 
 # Object files for double complex precision
 ztestl1o = c_zblas1.o
-
 ztestl2o = c_zblas2.o c_z2chke.o auxiliary.o c_xerbla.o
-
 ztestl3o = c_zblas3.o c_z3chke.o auxiliary.o c_xerbla.o
 
 all: all1 all2 all3
@@ -68,34 +60,34 @@ ztest3: xzcblat3
 
 # Single real
 xscblat1: $(stestl1o) c_sblat1.o
-	$(LOADER) $(LOADOPTS) -o xscblat1 c_sblat1.o $(stestl1o) $(LIB)
+	$(LOADER) $(LOADOPTS) -o $@ c_sblat1.o $(stestl1o) $(LIB)
 xscblat2: $(stestl2o) c_sblat2.o
-	$(LOADER) $(LOADOPTS) -o xscblat2 c_sblat2.o $(stestl2o) $(LIB)
+	$(LOADER) $(LOADOPTS) -o $@ c_sblat2.o $(stestl2o) $(LIB)
 xscblat3: $(stestl3o) c_sblat3.o
-	$(LOADER) $(LOADOPTS) -o xscblat3 c_sblat3.o $(stestl3o) $(LIB)
+	$(LOADER) $(LOADOPTS) -o $@ c_sblat3.o $(stestl3o) $(LIB)
 # Double real
 xdcblat1: $(dtestl1o) c_dblat1.o
-	$(LOADER) $(LOADOPTS) -o xdcblat1 c_dblat1.o $(dtestl1o) $(LIB)
+	$(LOADER) $(LOADOPTS) -o $@ c_dblat1.o $(dtestl1o) $(LIB)
 xdcblat2: $(dtestl2o) c_dblat2.o
-	$(LOADER) $(LOADOPTS) -o xdcblat2 c_dblat2.o $(dtestl2o) $(LIB)
+	$(LOADER) $(LOADOPTS) -o $@ c_dblat2.o $(dtestl2o) $(LIB)
 xdcblat3: $(dtestl3o) c_dblat3.o
-	$(LOADER) $(LOADOPTS) -o xdcblat3 c_dblat3.o $(dtestl3o) $(LIB)
+	$(LOADER) $(LOADOPTS) -o $@ c_dblat3.o $(dtestl3o) $(LIB)
 
 # Single complex
 xccblat1: $(ctestl1o) c_cblat1.o
-	$(LOADER) $(LOADOPTS) -o xccblat1 c_cblat1.o $(ctestl1o) $(LIB)
+	$(LOADER) $(LOADOPTS) -o $@ c_cblat1.o $(ctestl1o) $(LIB)
 xccblat2: $(ctestl2o) c_cblat2.o
-	$(LOADER) $(LOADOPTS) -o xccblat2 c_cblat2.o $(ctestl2o) $(LIB)
+	$(LOADER) $(LOADOPTS) -o $@ c_cblat2.o $(ctestl2o) $(LIB)
 xccblat3: $(ctestl3o) c_cblat3.o
-	$(LOADER) $(LOADOPTS) -o xccblat3 c_cblat3.o $(ctestl3o) $(LIB)
+	$(LOADER) $(LOADOPTS) -o $@ c_cblat3.o $(ctestl3o) $(LIB)
 
 # Double complex
 xzcblat1: $(ztestl1o) c_zblat1.o
-	$(LOADER) $(LOADOPTS) -o xzcblat1 c_zblat1.o $(ztestl1o) $(LIB)
+	$(LOADER) $(LOADOPTS) -o $@ c_zblat1.o $(ztestl1o) $(LIB)
 xzcblat2: $(ztestl2o) c_zblat2.o
-	$(LOADER) $(LOADOPTS) -o xzcblat2 c_zblat2.o $(ztestl2o) $(LIB)
+	$(LOADER) $(LOADOPTS) -o $@ c_zblat2.o $(ztestl2o) $(LIB)
 xzcblat3: $(ztestl3o) c_zblat3.o
-	$(LOADER) $(LOADOPTS) -o xzcblat3 c_zblat3.o $(ztestl3o) $(LIB)
+	$(LOADER) $(LOADOPTS) -o $@ c_zblat3.o $(ztestl3o) $(LIB)
 
 
 # RUN TESTS
@@ -103,11 +95,11 @@ run:
 	@echo "--> TESTING CBLAS 1 - SINGLE PRECISION <--"
 	@./xscblat1 > stest1.out
 	@echo "--> TESTING CBLAS 1 - DOUBLE PRECISION <--"
-	@./xdcblat1  > dtest1.out
+	@./xdcblat1 > dtest1.out
 	@echo "--> TESTING CBLAS 1 - COMPLEX PRECISION <--"
-	@./xccblat1  > ctest1.out
+	@./xccblat1 > ctest1.out
 	@echo "--> TESTING CBLAS 1 - DOUBLE COMPLEX PRECISION <--"
-	@./xzcblat1	 > ztest1.out
+	@./xzcblat1 > ztest1.out
 	@echo "--> TESTING CBLAS 2 - SINGLE PRECISION <--"
 	@./xscblat2 < sin2 > stest2.out
 	@echo "--> TESTING CBLAS 2 - DOUBLE PRECISION <--"
@@ -115,7 +107,7 @@ run:
 	@echo "--> TESTING CBLAS 2 - COMPLEX PRECISION <--"
 	@./xccblat2 < cin2 > ctest2.out
 	@echo "--> TESTING CBLAS 2 - DOUBLE COMPLEX PRECISION <--"
-	@./xzcblat2	< zin2	> ztest2.out
+	@./xzcblat2 < zin2 > ztest2.out
 	@echo "--> TESTING CBLAS 3 - SINGLE PRECISION <--"
 	@./xscblat3 < sin3 > stest3.out
 	@echo "--> TESTING CBLAS 3 - DOUBLE PRECISION <--"
@@ -123,12 +115,12 @@ run:
 	@echo "--> TESTING CBLAS 3 - COMPLEX PRECISION <--"
 	@./xccblat3 < cin3 > ctest3.out
 	@echo "--> TESTING CBLAS 3 - DOUBLE COMPLEX PRECISION <--"
-	@./xzcblat3	< zin3 > ztest3.out
+	@./xzcblat3 < zin3 > ztest3.out
 
 .SUFFIXES: .o .f .c
 
 .c.o:
-	$(CC) -c $(CFLAGS) -I ../include -o $@ $<
+	$(CC) $(CFLAGS) -I../include -c -o $@ $<
 
 .f.o:
-	$(FORTRAN) $(OPTS) -c $< -o $@
+	$(FORTRAN) $(OPTS) -c -o $@ $<
diff --git a/CMAKE/tmp.kXjd1oSjcp b/CMAKE/tmp.kXjd1oSjcp
deleted file mode 100644
index e69de29b..00000000
--- a/CMAKE/tmp.kXjd1oSjcp
+++ /dev/null
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 81f4a5d9..36a66694 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,14 +23,14 @@ set(
 # the OSX RPATH settings have been updated per recommendations found
 # in the CMake Wiki:
 #  http://www.cmake.org/Wiki/CMake_RPATH_handling#Mac_OS_X_and_the_RPATH
-    set(CMAKE_MACOSX_RPATH ON)
-    set(CMAKE_SKIP_BUILD_RPATH FALSE)
-    set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-    list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" isSystemDir)
-    if("${isSystemDir}" STREQUAL "-1")
-        set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
-        set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-    endif()
+set(CMAKE_MACOSX_RPATH ON)
+set(CMAKE_SKIP_BUILD_RPATH FALSE)
+set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" isSystemDir)
+if("${isSystemDir}" STREQUAL "-1")
+  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
+  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+endif()
 
 
 # Configure the warning and code coverage suppression file
@@ -45,58 +45,58 @@ set(CMAKE_MODULE_PATH "${LAPACK_SOURCE_DIR}/CMAKE" ${CMAKE_MODULE_PATH})
 include(PreventInSourceBuilds)
 include(PreventInBuildInstalls)
 
-if (UNIX)
-   if ( "${CMAKE_Fortran_COMPILER}" MATCHES "ifort" )
-  set( CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fp-model strict" )
-   endif ()
-   if ( "${CMAKE_Fortran_COMPILER}" MATCHES "xlf" )
-  set( CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -qnosave -qstrict=none" )
-   endif ()
+if(UNIX)
+  if("${CMAKE_Fortran_COMPILER}" MATCHES "ifort")
+    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fp-model strict")
+  endif()
+  if("${CMAKE_Fortran_COMPILER}" MATCHES "xlf")
+    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -qnosave -qstrict=none")
+  endif()
 # Delete libmtsk in linking sequence for Sun/Oracle Fortran Compiler.
 # This library is not present in the Sun package SolarisStudio12.3-linux-x86-bin
-   string(REPLACE \;mtsk\; \; CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES "${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES}")
-endif ()
-
-if ( CMAKE_Fortran_COMPILER_ID STREQUAL "Compaq" )
-   if ( WIN32 )
-      if (CMAKE_GENERATOR STREQUAL "NMake Makefiles")
-         get_filename_component(CMAKE_Fortran_COMPILER_CMDNAM ${CMAKE_Fortran_COMPILER} NAME_WE)
-         message(STATUS "Using Compaq Fortran compiler with command name ${CMAKE_Fortran_COMPILER_CMDNAM}")
-         set( cmd ${CMAKE_Fortran_COMPILER_CMDNAM} )
-         string( TOLOWER "${cmd}" cmdlc )
-         if ( cmdlc STREQUAL "df" )
-            message(STATUS "Assume the Compaq Visual Fortran Compiler is being used")
-            set(CMAKE_Fortran_USE_RESPONSE_FILE_FOR_OBJECTS 1)
-            set(CMAKE_Fortran_USE_RESPONSE_FILE_FOR_INCLUDES 1)
-            #This is a workaround that is needed to avoid forward-slashes in the
-            #filenames listed in response files from incorrectly being interpreted as
-            #introducing compiler command options
-          if (${BUILD_SHARED_LIBS})
-               message(FATAL_ERROR "Making of shared libraries with CVF has not been tested.")
-            endif()
-            set(str "NMake version 9 or later should be used. NMake version 6.0 which is\n")
-            set(str "${str}   included with the CVF distribution fails to build Lapack because\n")
-            set(str "${str}   the number of source files exceeds the limit for NMake v6.0\n")
-            message(STATUS ${str})
-            set(CMAKE_Fortran_LINK_EXECUTABLE "LINK /out:<TARGET> <LINK_FLAGS> <LINK_LIBRARIES> <OBJECTS>")
-         endif()
+  string(REPLACE \;mtsk\; \; CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES "${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES}")
+endif()
+
+if(CMAKE_Fortran_COMPILER_ID STREQUAL "Compaq")
+  if(WIN32)
+    if(CMAKE_GENERATOR STREQUAL "NMake Makefiles")
+      get_filename_component(CMAKE_Fortran_COMPILER_CMDNAM ${CMAKE_Fortran_COMPILER} NAME_WE)
+      message(STATUS "Using Compaq Fortran compiler with command name ${CMAKE_Fortran_COMPILER_CMDNAM}")
+      set(cmd ${CMAKE_Fortran_COMPILER_CMDNAM})
+      string(TOLOWER "${cmd}" cmdlc)
+      if(cmdlc STREQUAL "df")
+        message(STATUS "Assume the Compaq Visual Fortran Compiler is being used")
+        set(CMAKE_Fortran_USE_RESPONSE_FILE_FOR_OBJECTS 1)
+        set(CMAKE_Fortran_USE_RESPONSE_FILE_FOR_INCLUDES 1)
+        #This is a workaround that is needed to avoid forward-slashes in the
+        #filenames listed in response files from incorrectly being interpreted as
+        #introducing compiler command options
+        if(${BUILD_SHARED_LIBS})
+          message(FATAL_ERROR "Making of shared libraries with CVF has not been tested.")
+        endif()
+        set(str "NMake version 9 or later should be used. NMake version 6.0 which is\n")
+        set(str "${str}   included with the CVF distribution fails to build Lapack because\n")
+        set(str "${str}   the number of source files exceeds the limit for NMake v6.0\n")
+        message(STATUS ${str})
+        set(CMAKE_Fortran_LINK_EXECUTABLE "LINK /out:<TARGET> <LINK_FLAGS> <LINK_LIBRARIES> <OBJECTS>")
       endif()
-   endif()
+    endif()
+  endif()
 endif()
 
 # Get Python
 message(STATUS "Looking for Python greater than 2.6 - ${PYTHONINTERP_FOUND}")
 find_package(PythonInterp 2.7) # lapack_testing.py uses features from python 2.7 and greater
-if (PYTHONINTERP_FOUND)
-   message(STATUS "Using Python version ${PYTHON_VERSION_STRING}")
+if(PYTHONINTERP_FOUND)
+  message(STATUS "Using Python version ${PYTHON_VERSION_STRING}")
 else()
-   message(STATUS "No suitable Python version found, so skipping summary tests.")
+  message(STATUS "No suitable Python version found, so skipping summary tests.")
 endif()
 # --------------------------------------------------
 
 set(LAPACK_INSTALL_EXPORT_NAME lapack-targets)
 
-if (UNIX)
+if(UNIX)
   include(GNUInstallDirs)
   set(ARCHIVE_DIR ${CMAKE_INSTALL_LIBDIR})
   set(LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR})
@@ -140,7 +140,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LAPACK_BINARY_DIR}/lib)
 
 # --------------------------------------------------
 # Check for any necessary platform specific compiler flags
-include( CheckLAPACKCompilerFlags )
+include(CheckLAPACKCompilerFlags)
 CheckLAPACKCompilerFlags()
 
 # --------------------------------------------------
@@ -155,11 +155,11 @@ CHECK_TIME_FUNCTION(EXT_ETIME_ TIME_FUNC)
 CHECK_TIME_FUNCTION(INT_ETIME TIME_FUNC)
 message(STATUS "--> Will use second_${TIME_FUNC}.f and dsecnd_${TIME_FUNC}.f as timing function.")
 
-set(SECOND_SRC  ${LAPACK_SOURCE_DIR}/INSTALL/second_${TIME_FUNC}.f)
-set(DSECOND_SRC  ${LAPACK_SOURCE_DIR}/INSTALL/dsecnd_${TIME_FUNC}.f)
+set(SECOND_SRC ${LAPACK_SOURCE_DIR}/INSTALL/second_${TIME_FUNC}.f)
+set(DSECOND_SRC ${LAPACK_SOURCE_DIR}/INSTALL/dsecnd_${TIME_FUNC}.f)
 
 # By default static library
-option(BUILD_SHARED_LIBS "Build shared libraries" OFF )
+option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
 
 option(BUILD_TESTING "Build tests" OFF)
 
@@ -183,7 +183,7 @@ if(BLAS_LIBRARIES)
   include(CheckFortranFunctionExists)
   set(CMAKE_REQUIRED_LIBRARIES ${BLAS_LIBRARIES})
   CHECK_FORTRAN_FUNCTION_EXISTS("dgemm" BLAS_FOUND)
-  unset( CMAKE_REQUIRED_LIBRARIES )
+  unset(CMAKE_REQUIRED_LIBRARIES)
   if(BLAS_FOUND)
     message(STATUS "--> BLAS supplied by user is WORKING, will use ${BLAS_LIBRARIES}.")
   else()
@@ -194,23 +194,23 @@ if(BLAS_LIBRARIES)
   endif()
 
 # User did not provide a BLAS Library but specified to search for one
-elseif( USE_OPTIMIZED_BLAS )
-  find_package( BLAS )
-endif ()
+elseif(USE_OPTIMIZED_BLAS)
+  find_package(BLAS)
+endif()
 
 # Neither user specified or optimized BLAS libraries can be used
 if(NOT BLAS_FOUND)
   message(STATUS "Using supplied NETLIB BLAS implementation")
   add_subdirectory(BLAS)
-  set( BLAS_LIBRARIES blas )
+  set(BLAS_LIBRARIES blas)
 else()
-  set( CMAKE_EXE_LINKER_FLAGS
+  set(CMAKE_EXE_LINKER_FLAGS
     "${CMAKE_EXE_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}"
     CACHE STRING "Linker flags for executables" FORCE)
-  set( CMAKE_MODULE_LINKER_FLAGS
+  set(CMAKE_MODULE_LINKER_FLAGS
     "${CMAKE_MODULE_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}"
     CACHE STRING "Linker flags for modules" FORCE)
-  set( CMAKE_SHARED_LINKER_FLAGS
+  set(CMAKE_SHARED_LINKER_FLAGS
     "${CMAKE_SHARED_LINKER_FLAGS} ${BLAS_LINKER_FLAGS}"
     CACHE STRING "Linker flags for shared libs" FORCE)
 endif()
@@ -228,7 +228,7 @@ endif()
 # XBLAS
 
 option(USE_XBLAS "Build extended precision (needs XBLAS)" OFF)
-if (USE_XBLAS)
+if(USE_XBLAS)
   find_library(XBLAS_LIBRARY NAMES xblas)
 endif()
 
@@ -237,9 +237,9 @@ option(USE_OPTIMIZED_LAPACK "Whether or not to use an optimized LAPACK library i
 # --------------------------------------------------
 # LAPACK
 # User did not provide a LAPACK Library but specified to search for one
-if( USE_OPTIMIZED_LAPACK )
-  find_package( LAPACK )
-endif ()
+if(USE_OPTIMIZED_LAPACK)
+  find_package(LAPACK)
+endif()
 
 # Check the usage of the user provided or automatically found LAPACK libraries
 if(LAPACK_LIBRARIES)
@@ -247,35 +247,35 @@ if(LAPACK_LIBRARIES)
   set(CMAKE_REQUIRED_LIBRARIES ${LAPACK_LIBRARIES})
   # Check if new routine of 3.4.0 is in LAPACK_LIBRARIES
   CHECK_FORTRAN_FUNCTION_EXISTS("dgeqrt" LATESTLAPACK_FOUND)
-  unset( CMAKE_REQUIRED_LIBRARIES )
+  unset(CMAKE_REQUIRED_LIBRARIES)
   if(LATESTLAPACK_FOUND)
     message(STATUS "--> LAPACK supplied by user is WORKING, will use ${LAPACK_LIBRARIES}.")
   else()
-    message(ERROR "--> LAPACK supplied by user is not WORKING or is older than LAPACK 3.4.0, 	CANNOT USE ${LAPACK_LIBRARIES}.")
+    message(ERROR "--> LAPACK supplied by user is not WORKING or is older than LAPACK 3.4.0, CANNOT USE ${LAPACK_LIBRARIES}.")
     message(ERROR "-->     Will use REFERENCE LAPACK (by default)")
     message(ERROR "-->     Or Correct your LAPACK_LIBRARIES entry ")
     message(ERROR "-->     Or Consider checking USE_OPTIMIZED_LAPACK")
   endif()
-endif ()
+endif()
 
 # Neither user specified or optimized LAPACK libraries can be used
 if(NOT LATESTLAPACK_FOUND)
   message(STATUS "Using supplied NETLIB LAPACK implementation")
-  set( LAPACK_LIBRARIES lapack )
+  set(LAPACK_LIBRARIES lapack)
   add_subdirectory(SRC)
 else()
-  set( CMAKE_EXE_LINKER_FLAGS
+  set(CMAKE_EXE_LINKER_FLAGS
     "${CMAKE_EXE_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}"
     CACHE STRING "Linker flags for executables" FORCE)
-  set( CMAKE_MODULE_LINKER_FLAGS
+  set(CMAKE_MODULE_LINKER_FLAGS
     "${CMAKE_MODULE_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}"
     CACHE STRING "Linker flags for modules" FORCE)
-  set( CMAKE_SHARED_LINKER_FLAGS
+  set(CMAKE_SHARED_LINKER_FLAGS
     "${CMAKE_SHARED_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}"
     CACHE STRING "Linker flags for shared libs" FORCE)
 endif()
 
-message(STATUS "BUILD TESTING : ${BUILD_TESTING}" )
+message(STATUS "BUILD TESTING : ${BUILD_TESTING}")
 if(BUILD_TESTING)
   add_subdirectory(TESTING)
 endif()
@@ -287,11 +287,11 @@ option(LAPACKE "Build LAPACKE" OFF)
 # LAPACKE has also the interface to some routines from tmglib,
 # if LAPACKE_WITH_TMG is selected, we need to add those routines to LAPACKE
 option(LAPACKE_WITH_TMG "Build LAPACKE with tmglib routines" OFF)
-if (LAPACKE_WITH_TMG)
+if(LAPACKE_WITH_TMG)
   set(LAPACKE ON)
 endif()
 if(BUILD_TESTING OR LAPACKE_WITH_TMG) #already included, avoid double inclusion
-     add_subdirectory(TESTING/MATGEN)
+  add_subdirectory(TESTING/MATGEN)
 endif()
 
 if(LAPACKE)
@@ -321,8 +321,8 @@ if(WIN32 AND NOT UNIX)
 else()
   set(CPACK_GENERATOR "TGZ")
   set(CPACK_SOURCE_GENERATOR TGZ)
-  set(CPACK_SOURCE_PACKAGE_FILE_NAME "lapack-${LAPACK_VERSION}" )
-  set(CPACK_SOURCE_IGNORE_FILES ~$ .svn ${CPACK_SOURCE_IGNORE_FILES} )
+  set(CPACK_SOURCE_PACKAGE_FILE_NAME "lapack-${LAPACK_VERSION}")
+  set(CPACK_SOURCE_IGNORE_FILES ~$ .svn ${CPACK_SOURCE_IGNORE_FILES})
 endif()
 include(CPack)
 
@@ -381,7 +381,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_D
   install(FILES
   ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
   DESTINATION ${PKG_CONFIG_DIR}
-   )
+  )
 
 configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-install.cmake.in
   ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake @ONLY)
diff --git a/DOCS/groups-usr.dox b/DOCS/groups-usr.dox
index 63556ef8..6c31e4cf 100644
--- a/DOCS/groups-usr.dox
+++ b/DOCS/groups-usr.dox
@@ -129,10 +129,10 @@
  ****
  *
  * @defgroup doubleGEsolve double
- *   @ingroup solveGE 
+ *   @ingroup solveGE
  *   This is the group of double solve driver functions for GE matrices
  * @defgroup doublePOsolve double
- *   @ingroup solvePO 
+ *   @ingroup solvePO
  *   This is the group of double solve driver functions for PO matrices
  * @defgroup doubleSYsolve double
  *   @ingroup solveSY
@@ -147,22 +147,22 @@
  *   @ingroup solvePT
  *   This is the group of double solve driver functions for PT matrices
  * @defgroup doubleGEeigen double
- *   @ingroup eigenGE 
+ *   @ingroup eigenGE
  *   This is the group of double eigenvalue driver functions for GE matrices
  * @defgroup doubleSYeigen double
  *   @ingroup eigenSY
  *   This is the group of double eigenvalue driver functions for SY matrices
  * @defgroup doubleGEsing double
- *   @ingroup singGE 
+ *   @ingroup singGE
  *   This is the group of double singular value driver functions for GE matrices
  * @defgroup doubleGEcomputational double
- *   @ingroup computationalGE 
+ *   @ingroup computationalGE
  *   This is the group of double computational functions for GE matrices
  * @defgroup doublePOcomputational double
- *   @ingroup computationalPO 
+ *   @ingroup computationalPO
  *   This is the group of double computational functions for PO matrices
  * @defgroup doubleSYcomputational double
- *   @ingroup computationalSY 
+ *   @ingroup computationalSY
  *   This is the group of double computational functions for SY matrices
  * @defgroup doubleGBcomputational double
  *   @ingroup computationalGB
@@ -174,22 +174,22 @@
  *   @ingroup computationalPT
  *   This is the group of double computational functions for PT matrices
  * @defgroup doubleGEauxiliary double
- *   @ingroup auxiliaryGE 
+ *   @ingroup auxiliaryGE
  *   This is the group of double auxiliary functions for GE matrices
  * @defgroup doublePOauxiliary double
- *   @ingroup auxiliaryPO 
+ *   @ingroup auxiliaryPO
  *   This is the group of double auxiliary functions for PO matrices
  * @defgroup doubleSYauxiliary double
  *   @ingroup auxiliarySY
  *   This is the group of double auxiliary functions for SY matrices
  * @defgroup doubleGBauxiliary double
- *   @ingroup auxiliaryGB 
+ *   @ingroup auxiliaryGB
  *   This is the group of double auxiliary functions for GB matrices
  * @defgroup doublePTauxiliary double
- *   @ingroup auxiliaryPT 
+ *   @ingroup auxiliaryPT
  *   This is the group of double auxiliary functions for PT matrices
  * @defgroup doubleGTauxiliary double
- *   @ingroup auxiliaryGT 
+ *   @ingroup auxiliaryGT
  *   This is the group of double auxiliary functions for GT matrices
  * @defgroup doubleOTHERauxiliary  double
  *   @ingroup OTHERauxiliary
@@ -207,10 +207,10 @@
  ****
  *
  * @defgroup realGEsolve real
- *   @ingroup solveGE 
+ *   @ingroup solveGE
  *   This is the group of real solve driver functions for GE matrices
  * @defgroup realPOsolve real
- *   @ingroup solvePO 
+ *   @ingroup solvePO
  *   This is the group of real solve driver functions for PO matrices
  * @defgroup realSYsolve real
  *   @ingroup solveSY
@@ -225,22 +225,22 @@
  *   @ingroup solvePT
  *   This is the group of real solve driver functions for PT matrices
  * @defgroup realGEeigen real
- *   @ingroup eigenGE 
+ *   @ingroup eigenGE
  *   This is the group of real eigenvalue driver functions for GE matrices
  * @defgroup realSYeigen real
  *   @ingroup eigenSY
  *   This is the group of real eigenvalue driver functions for SY matrices
  * @defgroup realGEsing real
- *   @ingroup singGE 
+ *   @ingroup singGE
  *   This is the group of real singular value driver functions for GE matrices
  * @defgroup realGEcomputational real
- *   @ingroup computationalGE 
+ *   @ingroup computationalGE
  *   This is the group of real computational functions for GE matrices
  * @defgroup realPOcomputational real
- *   @ingroup computationalPO 
+ *   @ingroup computationalPO
  *   This is the group of real computational functions for PO matrices
  * @defgroup realSYcomputational real
- *   @ingroup computationalSY 
+ *   @ingroup computationalSY
  *   This is the group of real computational functions for SY matrices
  * @defgroup realGBcomputational real
  *   @ingroup computationalGB
@@ -252,16 +252,16 @@
  *   @ingroup computationalGT
  *   This is the group of real computational functions for GT matrices
  * @defgroup realGEauxiliary real
- *   @ingroup auxiliaryGE 
+ *   @ingroup auxiliaryGE
  *   This is the group of real auxiliary functions for GE matrices
  * @defgroup realPOauxiliary real
- *   @ingroup auxiliaryPO 
+ *   @ingroup auxiliaryPO
  *   This is the group of real auxiliary functions for PO matrices
  * @defgroup realSYauxiliary real
  *   @ingroup auxiliarySY
  *   This is the group of real auxiliary functions for SY matrices
  * @defgroup realGBauxiliary real
- *   @ingroup auxiliaryGB 
+ *   @ingroup auxiliaryGB
  *   This is the group of real auxiliary functions for GB matrices
  * @defgroup realGTauxiliary real
  *   @ingroup auxiliaryGT
@@ -285,10 +285,10 @@
  ****
  *
  * @defgroup complexGEsolve complex
- *   @ingroup solveGE 
+ *   @ingroup solveGE
  *   This is the group of complex solve driver functions for GE matrices
  * @defgroup complexPOsolve complex
- *   @ingroup solvePO 
+ *   @ingroup solvePO
  *   This is the group of complex solve driver functions for PO matrices
  * @defgroup complexSYsolve complex
  *   @ingroup solveSY
@@ -306,7 +306,7 @@
  *   @ingroup solvePT
  *   This is the group of complex solve driver functions for PT matrices
  * @defgroup complexGEeigen complex
- *   @ingroup eigenGE 
+ *   @ingroup eigenGE
  *   This is the group of complex eigenvalue driver functions for GE matrices
  * @defgroup complexSYeigen complex
  *   @ingroup eigenSY
@@ -315,19 +315,19 @@
  *   @ingroup eigenHE
  *   This is the group of complex eigenvalue driver functions for HE matrices
  * @defgroup complexGEsing complex
- *   @ingroup singGE 
+ *   @ingroup singGE
  *   This is the group of complex singular value driver functions for GE matrices
  * @defgroup complexGEcomputational complex
- *   @ingroup computationalGE 
+ *   @ingroup computationalGE
  *   This is the group of complex computational functions for GE matrices
  * @defgroup complexPOcomputational complex
- *   @ingroup computationalPO 
+ *   @ingroup computationalPO
  *   This is the group of complex computational functions for PO matrices
  * @defgroup complexSYcomputational complex
- *   @ingroup computationalSY 
+ *   @ingroup computationalSY
  *   This is the group of complex computational functions for SY matrices
  * @defgroup complexHEcomputational complex
- *   @ingroup computationalHE 
+ *   @ingroup computationalHE
  *   This is the group of complex computational functions for HE matrices
  * @defgroup complexGBcomputational complex
  *   @ingroup computationalGB
@@ -339,10 +339,10 @@
  *   @ingroup computationalPT
  *   This is the group of complex computational functions for PT matrices
  * @defgroup complexGEauxiliary complex
- *   @ingroup auxiliaryGE 
+ *   @ingroup auxiliaryGE
  *   This is the group of complex auxiliary functions for GE matrices
  * @defgroup complexPOauxiliary complex
- *   @ingroup auxiliaryPO 
+ *   @ingroup auxiliaryPO
  *   This is the group of complex auxiliary functions for PO matrices
  * @defgroup complexSYauxiliary complex
  *   @ingroup auxiliarySY
@@ -351,7 +351,7 @@
  *   @ingroup auxiliaryHE
  *   This is the group of complex auxiliary functions for HE matrices
  * @defgroup complexGBauxiliary complex
- *   @ingroup auxiliaryGB 
+ *   @ingroup auxiliaryGB
  *   This is the group of complex auxiliary functions for GB matrices
  * @defgroup complexOTHERauxiliary  complex
  *   @ingroup OTHERauxiliary
@@ -369,10 +369,10 @@
  ****
  *
  * @defgroup complex16GEsolve complex16
- *   @ingroup solveGE 
+ *   @ingroup solveGE
  *   This is the group of complex16 solve driver functions for GE matrices
  * @defgroup complex16POsolve complex16
- *   @ingroup solvePO 
+ *   @ingroup solvePO
  *   This is the group of complex16 solve driver functions for PO matrices
  * @defgroup complex16SYsolve complex16
  *   @ingroup solveSY
@@ -390,7 +390,7 @@
  *   @ingroup solvePT
  *   This is the group of complex16 solve driver functions for PT matrices
  * @defgroup complex16GEeigen complex16
- *   @ingroup eigenGE 
+ *   @ingroup eigenGE
  *   This is the group of complex16 eigenvalue driver functions for GE matrices
  * @defgroup complex16SYeigen complex16
  *   @ingroup eigenSY
@@ -399,19 +399,19 @@
  *   @ingroup eigenHE
  *   This is the group of complex16 eigenvalue driver functions for HE matrices
  * @defgroup complex16GEsing complex16
- *   @ingroup singGE 
+ *   @ingroup singGE
  *   This is the group of complex16 singular value driver functions for GE matrices
  * @defgroup complex16GEcomputational complex16
- *   @ingroup computationalGE 
+ *   @ingroup computationalGE
  *   This is the group of complex16 computational functions for GE matrices
  * @defgroup complex16POcomputational complex16
- *   @ingroup computationalPO 
+ *   @ingroup computationalPO
  *   This is the group of complex16 computational functions for PO matrices
  * @defgroup complex16SYcomputational complex16
- *   @ingroup computationalSY 
+ *   @ingroup computationalSY
  *   This is the group of complex16 computational functions for SY matrices
  * @defgroup complex16HEcomputational complex16
- *   @ingroup computationalHE 
+ *   @ingroup computationalHE
  *   This is the group of complex16 computational functions for HE matrices
  * @defgroup complex16GBcomputational complex16
  *   @ingroup computationalGB
@@ -423,10 +423,10 @@
  *   @ingroup computationalPT
  *   This is the group of complex16 computational functions for PT matrices
  * @defgroup complex16GEauxiliary complex16
- *   @ingroup auxiliaryGE 
+ *   @ingroup auxiliaryGE
  *   This is the group of complex16 auxiliary functions for GE matrices
  * @defgroup complex16POauxiliary complex16
- *   @ingroup auxiliaryPO 
+ *   @ingroup auxiliaryPO
  *   This is the group of complex16 auxiliary functions for PO matrices
  * @defgroup complex16SYauxiliary complex16
  *   @ingroup auxiliarySY
@@ -435,7 +435,7 @@
  *   @ingroup auxiliaryHE
  *   This is the group of complex16 auxiliary functions for HE matrices
  * @defgroup complex16GBauxiliary complex16
- *   @ingroup auxiliaryGB 
+ *   @ingroup auxiliaryGB
  *   This is the group of complex16 auxiliary functions for GB matrices
  * @defgroup complex16OTHERcomputational  complex16
  *   @ingroup OTHERcomputational
@@ -459,75 +459,75 @@
  *   This is the group of LAPACK TESTING routines.
  *
  * @defgroup matgen Matrix Generation
- *   @ingroup testing 
+ *   @ingroup testing
  *   This is the group of LAPACK TESTING MATGEN routines.
  *
  * @defgroup lin Linear Solve
- *   @ingroup testing 
+ *   @ingroup testing
  *   This is the group of LAPACK TESTING LIN routines.
  *
  * @defgroup eig Eigenvalue and Singular value
- *   @ingroup testing 
+ *   @ingroup testing
  *   This is the group of LAPACK TESTING EIG routines.
  *
  * @defgroup real_matgen real
- *   @ingroup matgen 
+ *   @ingroup matgen
  *   This is the group of real LAPACK TESTING MATGEN routines.
  *
  * @defgroup double_matgen double
- *   @ingroup matgen 
+ *   @ingroup matgen
  *   This is the group of double LAPACK TESTING MATGEN routines.
  *
  * @defgroup complex_matgen complex
- *   @ingroup matgen 
+ *   @ingroup matgen
  *   This is the group of complex LAPACK TESTING MATGEN routines.
  *
  * @defgroup complex16_matgen complex16
- *   @ingroup matgen 
+ *   @ingroup matgen
  *   This is the group of complex16 LAPACK TESTING MATGEN routines.
  *
  * @defgroup aux_matgen aux
- *   @ingroup matgen 
+ *   @ingroup matgen
  *   This is the group of auxiliary LAPACK TESTING MATGEN routines.
  *
  * @defgroup single_lin real
- *   @ingroup lin 
+ *   @ingroup lin
  *   This is the group of real LAPACK TESTING LIN routines.
  *
  * @defgroup double_lin double
- *   @ingroup lin 
+ *   @ingroup lin
  *   This is the group of double LAPACK TESTING LIN routines.
  *
  * @defgroup complex_lin complex
- *   @ingroup lin 
+ *   @ingroup lin
  *   This is the group of complex LAPACK TESTING LIN routines.
  *
  * @defgroup complex16_lin complex16
- *   @ingroup lin 
+ *   @ingroup lin
  *   This is the group of complex16 LAPACK TESTING LIN routines.
  *
  * @defgroup aux_lin aux
- *   @ingroup lin 
+ *   @ingroup lin
  *   This is the group of auxiliary LAPACK TESTING LIN routines.
  *
  * @defgroup single_eig real
- *   @ingroup eig 
+ *   @ingroup eig
  *   This is the group of real LAPACK TESTING EIG routines.
  *
  * @defgroup double_eig double
- *   @ingroup eig 
+ *   @ingroup eig
  *   This is the group of double LAPACK TESTING EIG routines.
  *
  * @defgroup complex_eig complex
- *   @ingroup eig 
+ *   @ingroup eig
  *   This is the group of complex LAPACK TESTING EIG routines.
  *
  * @defgroup complex16_eig complex16
- *   @ingroup eig 
+ *   @ingroup eig
  *   This is the group of complex16 LAPACK TESTING EIG routines.
  *
  * @defgroup aux_eig aux
- *   @ingroup eig 
+ *   @ingroup eig
  *   This is the group of auxiliary LAPACK TESTING EIG routines.
  *
  ****
@@ -543,7 +543,7 @@
  * @defgroup level3 Level3
  *   @ingroup blas
  *   This is the group of LEVEL 3 BLAS routines.
-  * @defgroup aux_blas Auxiliary BLAS 
+  * @defgroup aux_blas Auxiliary BLAS
  *   @ingroup blas
  *   This is the group of Auxiliary 3 BLAS routines.
 * @defgroup blastesting Testing
@@ -554,52 +554,52 @@
  *   @ingroup level1
  *   This is the group of real LEVEL 1 BLAS routines.
  * @defgroup double_blas_level1 double
- *   @ingroup level1 
+ *   @ingroup level1
  *   This is the group of double LEVEL 1 BLAS routines.
  * @defgroup complex_blas_level1 complex
- *   @ingroup level1 
+ *   @ingroup level1
  *   This is the group of complex LEVEL 1 BLAS routines.
  * @defgroup complex16_blas_level1 complex16
- *   @ingroup level1 
+ *   @ingroup level1
  *   This is the group of complex16 LEVEL 1 BLAS routines.
  *
  * @defgroup single_blas_level2 real
  *   @ingroup level2
  *   This is the group of real LEVEL 2 BLAS routines.
  * @defgroup double_blas_level2 double
- *   @ingroup level2 
+ *   @ingroup level2
  *   This is the group of double LEVEL 2 BLAS routines.
  * @defgroup complex_blas_level2 complex
- *   @ingroup level2 
+ *   @ingroup level2
  *   This is the group of complex LEVEL 2 BLAS routines.
  * @defgroup complex16_blas_level2 complex16
- *   @ingroup level2 
+ *   @ingroup level2
  *   This is the group of complex16 LEVEL 2 BLAS routines.
  *
  * @defgroup single_blas_level3 real
  *   @ingroup level3
  *   This is the group of real LEVEL 3 BLAS routines.
  * @defgroup double_blas_level3 double
- *   @ingroup level3 
+ *   @ingroup level3
  *   This is the group of double LEVEL 3 BLAS routines.
  * @defgroup complex_blas_level3 complex
- *   @ingroup level3 
+ *   @ingroup level3
  *   This is the group of complex LEVEL 3 BLAS routines.
  * @defgroup complex16_blas_level3 complex16
- *   @ingroup level3 
+ *   @ingroup level3
  *   This is the group of complex16 LEVEL 3 BLAS routines.
  *
  * @defgroup single_blas_testing real
  *   @ingroup blastesting
  *   This is the group of real BLAS TESTING routines.
  * @defgroup double_blas_testing double
- *   @ingroup blastesting 
+ *   @ingroup blastesting
  *   This is the group of double BLAS TESTING routines.
  * @defgroup complex_blas_testing complex
- *   @ingroup blastesting 
+ *   @ingroup blastesting
  *   This is the group of complex BLAS TESTING routines.
  * @defgroup complex16_blas_testing complex16
- *   @ingroup blastesting 
+ *   @ingroup blastesting
  *   This is the group of complex16 BLAS TESTING routines.
  *
 **/
diff --git a/INSTALL/CMakeLists.txt b/INSTALL/CMakeLists.txt
index 1e2867f1..1e808a64 100644
--- a/INSTALL/CMakeLists.txt
+++ b/INSTALL/CMakeLists.txt
@@ -7,4 +7,3 @@ add_executable(secondtst_INT_ETIME second_INT_ETIME.f secondtst.f)
 add_executable(secondtst_INT_CPU_TIME second_INT_CPU_TIME.f secondtst.f)
 add_executable(testieee tstiee.f)
 add_executable(testversion ilaver.f LAPACK_version.f)
-
diff --git a/INSTALL/Makefile b/INSTALL/Makefile
index 91057de4..15f5252b 100644
--- a/INSTALL/Makefile
+++ b/INSTALL/Makefile
@@ -1,35 +1,35 @@
 include ../make.inc
 
-.SUFFIXES : .o .f
-all:  testlsame testslamch testdlamch testsecond testdsecnd testieee testversion
+.SUFFIXES: .o .f
+all: testlsame testslamch testdlamch testsecond testdsecnd testieee testversion
 
-testlsame:  lsame.o lsametst.o
-	$(LOADER) $(LOADOPTS) -o testlsame lsame.o lsametst.o
+testlsame: lsame.o lsametst.o
+	$(LOADER) $(LOADOPTS) -o $@ lsame.o lsametst.o
 
 testslamch: slamch.o lsame.o slamchtst.o
-	$(LOADER) $(LOADOPTS) -o testslamch slamch.o lsame.o slamchtst.o
+	$(LOADER) $(LOADOPTS) -o $@ slamch.o lsame.o slamchtst.o
 
 testdlamch: dlamch.o lsame.o dlamchtst.o
-	$(LOADER) $(LOADOPTS) -o testdlamch dlamch.o lsame.o dlamchtst.o
+	$(LOADER) $(LOADOPTS) -o $@ dlamch.o lsame.o dlamchtst.o
 
 testsecond: second_$(TIMER).o secondtst.o
 	@echo "[INFO] : TIMER value: $(TIMER) (given by make.inc)"
-	$(LOADER) $(LOADOPTS) -o testsecond second_$(TIMER).o secondtst.o
+	$(LOADER) $(LOADOPTS) -o $@ second_$(TIMER).o secondtst.o
 
 testdsecnd: dsecnd_$(TIMER).o dsecndtst.o
 	@echo "[INFO] : TIMER value: $(TIMER) (given by make.inc)"
-	$(LOADER) $(LOADOPTS) -o testdsecnd dsecnd_$(TIMER).o dsecndtst.o
+	$(LOADER) $(LOADOPTS) -o $@ dsecnd_$(TIMER).o dsecndtst.o
 
 testieee: tstiee.o
-	$(LOADER) $(LOADOPTS) -o testieee tstiee.o
+	$(LOADER) $(LOADOPTS) -o $@ tstiee.o
 
 testversion: ilaver.o LAPACK_version.o
-	$(LOADER) $(LOADOPTS) -o testversion ilaver.o LAPACK_version.o
+	$(LOADER) $(LOADOPTS) -o $@ ilaver.o LAPACK_version.o
 
 clean:
 	rm -f *.o
 .f.o:
-	$(FORTRAN) $(OPTS) -c $< -o $@
+	$(FORTRAN) $(OPTS) -c -o $@ $<
 
-slamch.o: slamch.f ; $(FORTRAN) $(NOOPT) -c $< -o $@
-dlamch.o: dlamch.f ; $(FORTRAN) $(NOOPT) -c $< -o $@
+slamch.o: slamch.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
+dlamch.o: dlamch.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
diff --git a/LAPACKE/CMakeLists.txt b/LAPACKE/CMakeLists.txt
index 904025f4..2a60a1ea 100644
--- a/LAPACKE/CMakeLists.txt
+++ b/LAPACKE/CMakeLists.txt
@@ -7,32 +7,32 @@ set(LAPACK_INSTALL_EXPORT_NAME lapacke-targets)
 include(FortranCInterface)
 ## Ensure that the fortran compiler and c compiler specified are compatible
 FortranCInterface_VERIFY()
-FortranCInterface_HEADER( ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h
-    MACRO_NAMESPACE "LAPACK_"
-    SYMBOL_NAMESPACE "LAPACK_" )
-if( NOT FortranCInterface_GLOBAL_FOUND OR NOT FortranCInterface_MODULE_FOUND)
+FortranCInterface_HEADER(${LAPACK_BINARY_DIR}/include/lapacke_mangling.h
+  MACRO_NAMESPACE "LAPACK_"
+  SYMBOL_NAMESPACE "LAPACK_")
+if(NOT FortranCInterface_GLOBAL_FOUND OR NOT FortranCInterface_MODULE_FOUND)
   message(WARNING "Reverting to pre-defined include/lapacke_mangling.h")
-  configure_file( include/lapacke_mangling_with_flags.h.in
-                  ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h )
-endif ()
+  configure_file(include/lapacke_mangling_with_flags.h.in
+                 ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h)
+endif()
 
-if (WIN32 AND NOT UNIX)
- add_definitions(-DHAVE_LAPACK_CONFIG_H -DLAPACK_COMPLEX_STRUCTURE)
- message (STATUS "Windows BUILD")
-endif ()
+if(WIN32 AND NOT UNIX)
+  add_definitions(-DHAVE_LAPACK_CONFIG_H -DLAPACK_COMPLEX_STRUCTURE)
+  message(STATUS "Windows BUILD")
+endif()
 
-get_directory_property( DirDefs COMPILE_DEFINITIONS )
+get_directory_property(DirDefs COMPILE_DEFINITIONS)
 
-include_directories( include ${LAPACK_BINARY_DIR}/include )
+include_directories(include ${LAPACK_BINARY_DIR}/include)
 add_subdirectory(include)
 add_subdirectory(src)
 add_subdirectory(utils)
 
 macro(append_subdir_files variable dirname)
-get_directory_property(holder DIRECTORY ${dirname} DEFINITION ${variable})
-foreach(depfile ${holder})
-  list(APPEND ${variable} "${dirname}/${depfile}")
-endforeach()
+  get_directory_property(holder DIRECTORY ${dirname} DEFINITION ${variable})
+  foreach(depfile ${holder})
+    list(APPEND ${variable} "${dirname}/${depfile}")
+  endforeach()
 endmacro()
 
 append_subdir_files(LAPACKE_INCLUDE "include")
@@ -41,32 +41,32 @@ append_subdir_files(SRCX_OBJ "src")
 append_subdir_files(MATGEN_OBJ "src")
 append_subdir_files(UTILS_OBJ "utils")
 
-if (USE_XBLAS)
-   add_library(lapacke ${SRC_OBJ} ${SRCX_OBJ} ${UTILS_OBJ})
-   target_link_libraries(lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} ${XBLAS_LIBRARY})
-else ()
-  if (LAPACKE_WITH_TMG)
-   add_library(lapacke ${SRC_OBJ} ${MATGEN_OBJ} ${UTILS_OBJ})
-   target_link_libraries(lapacke tmglib ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-  else ()
-   add_library(lapacke ${SRC_OBJ} ${UTILS_OBJ})
-   target_link_libraries(lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
+if(USE_XBLAS)
+  add_library(lapacke ${SRC_OBJ} ${SRCX_OBJ} ${UTILS_OBJ})
+  target_link_libraries(lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} ${XBLAS_LIBRARY})
+else()
+  if(LAPACKE_WITH_TMG)
+    add_library(lapacke ${SRC_OBJ} ${MATGEN_OBJ} ${UTILS_OBJ})
+    target_link_libraries(lapacke tmglib ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
+  else()
+    add_library(lapacke ${SRC_OBJ} ${UTILS_OBJ})
+    target_link_libraries(lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
   endif()
 endif()
 
 lapack_install_library(lapacke)
-install( FILES ${LAPACKE_INCLUDE} ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h DESTINATION include )
+install(FILES ${LAPACKE_INCLUDE} ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h DESTINATION include)
 
 if(BUILD_TESTING)
-   add_subdirectory(example)
+  add_subdirectory(example)
 endif()
 
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc @ONLY)
- install(FILES
+install(FILES
   ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc
   DESTINATION ${PKG_CONFIG_DIR}
-   )
+  )
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lapacke-config-version.cmake.in
   ${LAPACK_BINARY_DIR}/lapacke-config-version.cmake @ONLY)
diff --git a/LAPACKE/LICENSE b/LAPACKE/LICENSE
index 8fc2ed90..2c954cd6 100644
--- a/LAPACKE/LICENSE
+++ b/LAPACKE/LICENSE
@@ -1,26 +1,26 @@
-  Copyright (c) 2012, Intel Corp.

-  All rights reserved.

-

-  Redistribution and use in source and binary forms, with or without

-  modification, are permitted provided that the following conditions are met:

-

-    * Redistributions of source code must retain the above copyright notice,

-      this list of conditions and the following disclaimer.

-    * Redistributions in binary form must reproduce the above copyright

-      notice, this list of conditions and the following disclaimer in the

-      documentation and/or other materials provided with the distribution.

-    * Neither the name of Intel Corporation nor the names of its contributors

-      may be used to endorse or promote products derived from this software

-      without specific prior written permission.

-

-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

-  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE

-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

-  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF

-  THE POSSIBILITY OF SUCH DAMAGE.

+  Copyright (c) 2012, Intel Corp.
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Intel Corporation nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+  THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/LAPACKE/Makefile b/LAPACKE/Makefile
index 8d282880..f1b07ad5 100644
--- a/LAPACKE/Makefile
+++ b/LAPACKE/Makefile
@@ -61,4 +61,3 @@ cleanlib:
 cleanall: clean
 	rm -f $(LAPACKE)
 	cd example && $(MAKE) clean
-
diff --git a/LAPACKE/cmake/tmp.dnyp4S2eiM b/LAPACKE/cmake/tmp.dnyp4S2eiM
deleted file mode 100644
index e69de29b..00000000
--- a/LAPACKE/cmake/tmp.dnyp4S2eiM
+++ /dev/null
diff --git a/LAPACKE/example/Makefile b/LAPACKE/example/Makefile
index c142a33c..80968e8c 100644
--- a/LAPACKE/example/Makefile
+++ b/LAPACKE/example/Makefile
@@ -5,31 +5,27 @@ all: xexample_DGESV_rowmajor \
      xexample_DGELS_rowmajor \
      xexample_DGELS_colmajor
 
-LIBRAIRIES= ../../$(LAPACKELIB) ../../$(LAPACKLIB) $(BLASLIB)
+LIBRARIES = ../../$(LAPACKELIB) ../../$(LAPACKLIB) $(BLASLIB)
 
 # Double Precision Examples
-xexample_DGESV_rowmajor: example_DGESV_rowmajor.o lapacke_example_aux.o $(LIBRAIRIES)
-	$(LOADER) $(LOADOPTS)  example_DGESV_rowmajor.o lapacke_example_aux.o \
-	$(LIBRAIRIES) -o $@
+xexample_DGESV_rowmajor: example_DGESV_rowmajor.o lapacke_example_aux.o $(LIBRARIES)
+	$(LOADER) $(LOADOPTS) -o $@ example_DGESV_rowmajor.o lapacke_example_aux.o $(LIBRARIES)
 	./$@
 
-xexample_DGESV_colmajor: example_DGESV_colmajor.o lapacke_example_aux.o $(LIBRAIRIES)
-	$(LOADER) $(LOADOPTS)  example_DGESV_colmajor.o lapacke_example_aux.o \
-	$(LIBRAIRIES) -o $@
+xexample_DGESV_colmajor: example_DGESV_colmajor.o lapacke_example_aux.o $(LIBRARIES)
+	$(LOADER) $(LOADOPTS) -o $@ example_DGESV_colmajor.o lapacke_example_aux.o $(LIBRARIES)
 	./$@
 
-xexample_DGELS_rowmajor: example_DGELS_rowmajor.o lapacke_example_aux.o $(LIBRAIRIES)
-	$(LOADER) $(LOADOPTS)  example_DGELS_rowmajor.o lapacke_example_aux.o \
-	$(LIBRAIRIES) -o $@
+xexample_DGELS_rowmajor: example_DGELS_rowmajor.o lapacke_example_aux.o $(LIBRARIES)
+	$(LOADER) $(LOADOPTS) -o $@ example_DGELS_rowmajor.o lapacke_example_aux.o $(LIBRARIES)
 	./$@
 
-xexample_DGELS_colmajor: example_DGELS_colmajor.o lapacke_example_aux.o $(LIBRAIRIES)
-	$(LOADER) $(LOADOPTS)  example_DGELS_colmajor.o lapacke_example_aux.o \
-	$(LIBRAIRIES) -o $@
+xexample_DGELS_colmajor: example_DGELS_colmajor.o lapacke_example_aux.o $(LIBRARIES)
+	$(LOADER) $(LOADOPTS) -o $@ example_DGELS_colmajor.o lapacke_example_aux.o $(LIBRARIES)
 	./$@
 
 .c.o:
-	$(CC) -c $(CFLAGS) -I. -I ../include -o $@ $<
+	$(CC) $(CFLAGS) -I. -I../include -c -o $@ $<
 
 clean:
 	rm -f *.o x*
diff --git a/LAPACKE/include/CMakeLists.txt b/LAPACKE/include/CMakeLists.txt
index 3034962b..4c30c050 100644
--- a/LAPACKE/include/CMakeLists.txt
+++ b/LAPACKE/include/CMakeLists.txt
@@ -1,3 +1,3 @@
-set (LAPACKE_INCLUDE lapacke.h lapacke_config.h lapacke_utils.h )
+set(LAPACKE_INCLUDE lapacke.h lapacke_config.h lapacke_utils.h)
 
 file(COPY ${LAPACKE_INCLUDE} DESTINATION ${LAPACK_BINARY_DIR}/include)
diff --git a/LAPACKE/src/CMakeLists.txt b/LAPACKE/src/CMakeLists.txt
index fe590a35..632a0f83 100644
--- a/LAPACKE/src/CMakeLists.txt
+++ b/LAPACKE/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 #aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} SRC_OBJ)
 
-set (SRC_OBJ
+set(SRC_OBJ
 lapacke_cbbcsd.c
 lapacke_cbbcsd_work.c
 lapacke_cbdsqr.c
@@ -2153,7 +2153,7 @@ lapacke_chesvxx_work.c  lapacke_dgbsvxx_work.c  lapacke_dsysvxx_work.c  lapacke_
 )
 
 # FILE PARTS OF TMGLIB
-set (MATGEN_OBJ
+set(MATGEN_OBJ
 lapacke_clatms.c
 lapacke_clatms_work.c
 lapacke_dlatms.c
diff --git a/LAPACKE/src/Makefile b/LAPACKE/src/Makefile
index e308b031..0d3c6b0d 100644
--- a/LAPACKE/src/Makefile
+++ b/LAPACKE/src/Makefile
@@ -2223,16 +2223,14 @@ ifdef BUILD_DEPRECATED
 DEPRECATED = $(DEPRECSRC)
 endif
 
-OBJ_FILES := $(C_FILES:.o=.o)
-
 all: ../../$(LAPACKELIB)
 
 ../../$(LAPACKELIB): $(ALLOBJ) $(ALLXOBJ) $(DEPRECATED)
-	$(ARCH) $(ARCHFLAGS) ../../$(LAPACKELIB) $(ALLOBJ) $(ALLXOBJ) $(DEPRECATED)
-	$(RANLIB) ../../$(LAPACKELIB)
+	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ) $(DEPRECATED)
+	$(RANLIB) $@
 
 .c.o:
-	$(CC) -c $(CFLAGS) -I ../include -o $@ $<
+	$(CC) $(CFLAGS) -I../include -c -o $@ $<
 
 clean:
 	rm -f *.o
diff --git a/LAPACKE/utils/CMakeLists.txt b/LAPACKE/utils/CMakeLists.txt
index 66be48bc..c8b8511e 100644
--- a/LAPACKE/utils/CMakeLists.txt
+++ b/LAPACKE/utils/CMakeLists.txt
@@ -1,4 +1,4 @@
-set (UTILS_OBJ
+set(UTILS_OBJ
 lapacke_c_nancheck.c            lapacke_ctr_trans.c             lapacke_make_complex_float.c    lapacke_zgb_nancheck.c
 lapacke_cgb_nancheck.c          lapacke_d_nancheck.c            lapacke_s_nancheck.c            lapacke_zgb_trans.c
 lapacke_cgb_trans.c             lapacke_dgb_nancheck.c          lapacke_sgb_nancheck.c          lapacke_zge_nancheck.c
@@ -30,10 +30,10 @@ lapacke_cst_nancheck.c          lapacke_dtb_nancheck.c          lapacke_stb_nanc
 lapacke_csy_nancheck.c          lapacke_dtb_trans.c             lapacke_stb_trans.c             lapacke_zsy_trans.c
 lapacke_csy_trans.c             lapacke_dtf_nancheck.c          lapacke_stf_nancheck.c          lapacke_ztb_nancheck.c
 lapacke_ctb_nancheck.c          lapacke_dtf_trans.c             lapacke_stf_trans.c             lapacke_ztb_trans.c
-lapacke_ctb_trans.c	            lapacke_dtp_nancheck.c          lapacke_stp_nancheck.c          lapacke_ztf_nancheck.c
+lapacke_ctb_trans.c             lapacke_dtp_nancheck.c          lapacke_stp_nancheck.c          lapacke_ztf_nancheck.c
 lapacke_ctf_nancheck.c          lapacke_dtp_trans.c             lapacke_stp_trans.c             lapacke_ztf_trans.c
 lapacke_ctf_trans.c             lapacke_dtr_nancheck.c          lapacke_str_nancheck.c          lapacke_ztp_nancheck.c
 lapacke_ctp_nancheck.c          lapacke_dtr_trans.c             lapacke_str_trans.c             lapacke_ztp_trans.c
 lapacke_ctp_trans.c             lapacke_lsame.c                 lapacke_xerbla.c                lapacke_ztr_nancheck.c
 lapacke_ctr_nancheck.c          lapacke_make_complex_double.c   lapacke_z_nancheck.c            lapacke_ztr_trans.c
-)
\ No newline at end of file
+)
diff --git a/LAPACKE/utils/Makefile b/LAPACKE/utils/Makefile
index 1d785678..57b8f0dd 100644
--- a/LAPACKE/utils/Makefile
+++ b/LAPACKE/utils/Makefile
@@ -190,7 +190,7 @@ lib: $(OBJ)
 	$(RANLIB) ../../$(LAPACKELIB)
 
 .c.o:
-	$(CC) -c $(CFLAGS) -I ../include -o $@ $<
+	$(CC) $(CFLAGS) -I../include -c -o $@ $<
 
 clean:
 	rm -f *.o
diff --git a/Makefile b/Makefile
index 86d3ce7d..497fc3cd 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ blaslib:
 cblaslib:
 	( cd CBLAS; $(MAKE) )
 
-lapacklib:	lapack_install
+lapacklib: lapack_install
 	( cd SRC; $(MAKE) )
 
 lapackelib: lapacklib
@@ -36,28 +36,28 @@ lapacke_example: lapackelib
 	( cd LAPACKE/example; $(MAKE) )
 
 variants:
-	( cd SRC/VARIANTS ; $(MAKE))
+	( cd SRC/VARIANTS; $(MAKE) )
 
 tmglib:
 	( cd TESTING/MATGEN; $(MAKE) )
 
-lapack_testing:	lib
-	( cd TESTING ; $(MAKE) )
+lapack_testing: lib
+	( cd TESTING; $(MAKE) )
 	./lapack_testing.py
 
 variants_testing: lib variants
-	( cd TESTING ; rm -f xlintst* ; $(MAKE)  VARLIB='SRC/VARIANTS/LIB/cholrl.a' ; \
-	mv stest.out stest_cholrl.out ; mv dtest.out dtest_cholrl.out ; mv ctest.out ctest_cholrl.out ; mv ztest.out ztest_cholrl.out )
-	( cd TESTING ; rm -f xlintst* ; $(MAKE)  VARLIB='SRC/VARIANTS/LIB/choltop.a' ; \
-	mv stest.out stest_choltop.out ; mv dtest.out dtest_choltop.out ; mv ctest.out ctest_choltop.out ; mv ztest.out ztest_choltop.out )
-	( cd TESTING ; rm -f xlintst* ; $(MAKE)  VARLIB='SRC/VARIANTS/LIB/lucr.a' ; \
-	mv stest.out stest_lucr.out ; mv dtest.out dtest_lucr.out ; mv ctest.out ctest_lucr.out ; mv ztest.out ztest_lucr.out )
-	( cd TESTING ;  rm -f xlintst* ; $(MAKE)  VARLIB='SRC/VARIANTS/LIB/lull.a' ; \
-	mv stest.out stest_lull.out ; mv dtest.out dtest_lull.out ; mv ctest.out ctest_lull.out ; mv ztest.out ztest_lull.out )
-	( cd TESTING ;  rm -f xlintst* ; $(MAKE)  VARLIB='SRC/VARIANTS/LIB/lurec.a' ; \
-	mv stest.out stest_lurec.out ; mv dtest.out dtest_lurec.out ; mv ctest.out ctest_lurec.out ; mv ztest.out ztest_lurec.out )
-	( cd TESTING ;  rm -f xlintst* ; $(MAKE)  VARLIB='SRC/VARIANTS/LIB/qrll.a' ; \
-	mv stest.out stest_qrll.out ; mv dtest.out dtest_qrll.out ; mv ctest.out ctest_qrll.out ; mv ztest.out ztest_qrll.out )
+	( cd TESTING; rm -f xlintst*; $(MAKE) VARLIB='SRC/VARIANTS/LIB/cholrl.a'; \
+	mv stest.out stest_cholrl.out; mv dtest.out dtest_cholrl.out; mv ctest.out ctest_cholrl.out; mv ztest.out ztest_cholrl.out )
+	( cd TESTING; rm -f xlintst*; $(MAKE) VARLIB='SRC/VARIANTS/LIB/choltop.a'; \
+	mv stest.out stest_choltop.out; mv dtest.out dtest_choltop.out; mv ctest.out ctest_choltop.out; mv ztest.out ztest_choltop.out )
+	( cd TESTING; rm -f xlintst*; $(MAKE) VARLIB='SRC/VARIANTS/LIB/lucr.a'; \
+	mv stest.out stest_lucr.out; mv dtest.out dtest_lucr.out; mv ctest.out ctest_lucr.out; mv ztest.out ztest_lucr.out )
+	( cd TESTING; rm -f xlintst*; $(MAKE) VARLIB='SRC/VARIANTS/LIB/lull.a'; \
+	mv stest.out stest_lull.out; mv dtest.out dtest_lull.out; mv ctest.out ctest_lull.out; mv ztest.out ztest_lull.out )
+	( cd TESTING; rm -f xlintst*; $(MAKE) VARLIB='SRC/VARIANTS/LIB/lurec.a'; \
+	mv stest.out stest_lurec.out; mv dtest.out dtest_lurec.out; mv ctest.out ctest_lurec.out; mv ztest.out ztest_lurec.out )
+	( cd TESTING; rm -f xlintst*; $(MAKE) VARLIB='SRC/VARIANTS/LIB/qrll.a'; \
+	mv stest.out stest_qrll.out; mv dtest.out dtest_qrll.out; mv ctest.out ctest_qrll.out; mv ztest.out ztest_qrll.out )
 
 blas_testing:
 	( cd BLAS/TESTING; $(MAKE) -f Makeblat1 )
@@ -77,8 +77,8 @@ blas_testing:
 	           ./xblat3z < zblat3.in     )
 
 cblas_testing: blaslib
-	( cd CBLAS ; $(MAKE) cblas_testing)
-	( cd CBLAS ; $(MAKE) runtst)
+	( cd CBLAS; $(MAKE) cblas_testing )
+	( cd CBLAS; $(MAKE) runtst )
 
 
 
@@ -125,5 +125,4 @@ cleantesting:
 	( cd TESTING; rm -f xlin* xeig* )
 
 cleanall: cleanlib cleanblas_testing cleancblas_testing cleantesting
-	rm -f *.a TESTING/*.out INSTALL/test*  BLAS/*.out
-
+	rm -f *.a TESTING/*.out INSTALL/test* BLAS/*.out
diff --git a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt
index 66a9d57d..ada9158d 100644
--- a/SRC/CMakeLists.txt
+++ b/SRC/CMakeLists.txt
@@ -1,25 +1,33 @@
 #######################################################################
 #  This is the makefile to create a library for LAPACK.
 #  The files are organized as follows:
-#       ALLAUX -- Auxiliary routines called from all precisions
-#       ALLXAUX -- Auxiliary routines called from all precisions but
-#                  only from routines using extra precision.
-#       SCLAUX -- Auxiliary routines called from both REAL and COMPLEX
-#       DZLAUX -- Auxiliary routines called from both DOUBLE PRECISION
-#                 and COMPLEX*16
-#       SLASRC -- Single precision real LAPACK routines
+#       ALLAUX  -- Auxiliary routines called from all precisions
+#
+#       SCLAUX  -- Auxiliary routines called from both REAL and COMPLEX.
+#       DZLAUX  -- Auxiliary routines called from both DOUBLE and COMPLEX*16.
+#
+#       DSLASRC -- Double-single mixed precision real routines called from
+#                  single, single-extra and double precision real LAPACK
+#                  routines (i.e. from SLASRC, SXLASRC, DLASRC).
+#       ZCLASRC -- Double-single mixed precision complex routines called from
+#                  single, single-extra and double precision complex LAPACK
+#                  routines (i.e. from CLASRC, CXLASRC, ZLASRC).
+#
+#       SLASRC  -- Single precision real LAPACK routines
 #       SXLASRC -- Single precision real LAPACK routines using extra
 #                  precision.
-#       CLASRC -- Single precision complex LAPACK routines
+#       CLASRC  -- Single precision complex LAPACK routines
 #       CXLASRC -- Single precision complex LAPACK routines using extra
 #                  precision.
-#       DLASRC -- Double precision real LAPACK routines
+#       DLASRC  -- Double precision real LAPACK routines
 #       DXLASRC -- Double precision real LAPACK routines using extra
 #                  precision.
-#       ZLASRC -- Double precision complex LAPACK routines
+#       ZLASRC  -- Double precision complex LAPACK routines
 #       ZXLASRC -- Double precision complex LAPACK routines using extra
 #                  precision.
 #
+#    DEPRECATED -- Deprecated routines in all precisions
+#
 #  The library can be set up to include routines for any combination
 #  of the four precisions.  To create or add to the library, enter make
 #  followed by one or more of the precisions desired.  Some examples:
@@ -46,12 +54,10 @@
 #
 #######################################################################
 
-set(ALLAUX  ilaenv.f ieeeck.f lsamen.f  iparmq.f iparam2stage.F
-    ilaprec.f ilatrans.f ilauplo.f iladiag.f chla_transtype.f
-    ../INSTALL/ilaver.f ../INSTALL/lsame.f xerbla.f xerbla_array.f
-    ../INSTALL/slamch.f)
-
-set(ALLXAUX )
+set(ALLAUX ilaenv.f ieeeck.f lsamen.f iparmq.f iparam2stage.F
+   ilaprec.f ilatrans.f ilauplo.f iladiag.f chla_transtype.f
+   ../INSTALL/ilaver.f ../INSTALL/lsame.f xerbla.f xerbla_array.f
+   ../INSTALL/slamch.f)
 
 set(SCLAUX
    sbdsdc.f
@@ -151,7 +157,7 @@ set(SLASRC
    strti2.f strtri.f strtrs.f stzrzf.f sstemr.f
    slansf.f spftrf.f spftri.f spftrs.f ssfrk.f stfsm.f stftri.f stfttp.f
    stfttr.f stpttf.f stpttr.f strttf.f strttp.f
-   sgejsv.f  sgesvj.f  sgsvj0.f  sgsvj1.f
+   sgejsv.f sgesvj.f sgsvj0.f sgsvj1.f
    sgeequb.f ssyequb.f spoequb.f sgbequb.f
    sbbcsd.f slapmr.f sorbdb.f sorbdb1.f sorbdb2.f sorbdb3.f sorbdb4.f
    sorbdb5.f sorbdb6.f sorcsd.f sorcsd2by1.f
@@ -167,7 +173,7 @@ set(SLASRC
 
 set(DSLASRC spotrs.f sgetrs.f spotrf.f sgetrf.f)
 
-set(SXLASRC  sgesvxx.f sgerfsx.f sla_gerfsx_extended.f sla_geamv.f
+set(SXLASRC sgesvxx.f sgerfsx.f sla_gerfsx_extended.f sla_geamv.f
    sla_gercond.f sla_gerpvgrw.f ssysvxx.f ssyrfsx.f
    sla_syrfsx_extended.f sla_syamv.f sla_syrcond.f sla_syrpvgrw.f
    sposvxx.f sporfsx.f sla_porfsx_extended.f sla_porcond.f
@@ -262,7 +268,7 @@ set(CLASRC
    cheevd_2stage.f cheev_2stage.f cheevx_2stage.f cheevr_2stage.f
    chbev_2stage.f chbevx_2stage.f chbevd_2stage.f chegv_2stage.f)
 
-set(CXLASRC     cgesvxx.f cgerfsx.f cla_gerfsx_extended.f cla_geamv.f
+set(CXLASRC cgesvxx.f cgerfsx.f cla_gerfsx_extended.f cla_geamv.f
    cla_gercond_c.f cla_gercond_x.f cla_gerpvgrw.f
    csysvxx.f csyrfsx.f cla_syrfsx_extended.f cla_syamv.f
    cla_syrcond_c.f cla_syrcond_x.f cla_syrpvgrw.f
@@ -316,7 +322,7 @@ set(DLASRC
    dpprfs.f dppsv.f  dppsvx.f dpptrf.f dpptri.f dpptrs.f dptcon.f
    dpteqr.f dptrfs.f dptsv.f  dptsvx.f dpttrs.f dptts2.f drscl.f
    dsbev.f  dsbevd.f dsbevx.f dsbgst.f dsbgv.f  dsbgvd.f dsbgvx.f
-   dsbtrd.f  dspcon.f dspev.f  dspevd.f dspevx.f dspgst.f
+   dsbtrd.f dspcon.f dspev.f  dspevd.f dspevx.f dspgst.f
    dspgv.f  dspgvd.f dspgvx.f dsprfs.f dspsv.f  dspsvx.f dsptrd.f
    dsptrf.f dsptri.f dsptrs.f dstegr.f dstein.f dstev.f  dstevd.f dstevr.f
    dstevx.f dsycon.f dsyev.f  dsyevd.f dsyevr.f
@@ -339,7 +345,7 @@ set(DLASRC
    dsgesv.f dsposv.f dlag2s.f slag2d.f dlat2s.f
    dlansf.f dpftrf.f dpftri.f dpftrs.f dsfrk.f dtfsm.f dtftri.f dtfttp.f
    dtfttr.f dtpttf.f dtpttr.f dtrttf.f dtrttp.f
-   dgejsv.f  dgesvj.f  dgsvj0.f  dgsvj1.f
+   dgejsv.f dgesvj.f dgsvj0.f dgsvj1.f
    dgeequb.f dsyequb.f dpoequb.f dgbequb.f
    dbbcsd.f dlapmr.f dorbdb.f dorbdb1.f dorbdb2.f dorbdb3.f dorbdb4.f
    dorbdb5.f dorbdb6.f dorcsd.f dorcsd2by1.f
@@ -453,7 +459,7 @@ set(ZLASRC
    zheevd_2stage.f zheev_2stage.f zheevx_2stage.f zheevr_2stage.f
    zhbev_2stage.f zhbevx_2stage.f zhbevd_2stage.f zhegv_2stage.f)
 
-set(ZXLASRC  zgesvxx.f zgerfsx.f zla_gerfsx_extended.f zla_geamv.f
+set(ZXLASRC zgesvxx.f zgerfsx.f zla_gerfsx_extended.f zla_geamv.f
    zla_gercond_c.f zla_gercond_x.f zla_gerpvgrw.f zsysvxx.f zsyrfsx.f
    zla_syrfsx_extended.f zla_syamv.f zla_syrcond_c.f zla_syrcond_x.f
    zla_syrpvgrw.f zposvxx.f zporfsx.f zla_porfsx_extended.f
@@ -464,45 +470,45 @@ set(ZXLASRC  zgesvxx.f zgerfsx.f zla_gerfsx_extended.f zla_geamv.f
    zla_lin_berr.f zlarscl2.f zlascl2.f zla_wwaddw.f)
 
 
-if( USE_XBLAS)
-  set(ALLXOBJ ${SXLASRC} ${DXLASRC} ${CXLASRC} ${ZXLASRC} ${ALLXAUX})
+if(USE_XBLAS)
+  set(ALLXOBJ ${SXLASRC} ${DXLASRC} ${CXLASRC} ${ZXLASRC})
 endif()
 
 if(BUILD_DEPRECATED)
-	list(APPEND SLASRC DEPRECATED/sgegs.f DEPRECATED/sgegv.f
+  list(APPEND SLASRC DEPRECATED/sgegs.f DEPRECATED/sgegv.f
     DEPRECATED/sgeqpf.f DEPRECATED/sgelsx.f DEPRECATED/sggsvd.f
     DEPRECATED/sggsvp.f DEPRECATED/slahrd.f DEPRECATED/slatzm.f DEPRECATED/stzrqf.f)
-	list(APPEND DLASRC DEPRECATED/dgegs.f DEPRECATED/dgegv.f
+  list(APPEND DLASRC DEPRECATED/dgegs.f DEPRECATED/dgegv.f
     DEPRECATED/dgeqpf.f DEPRECATED/dgelsx.f DEPRECATED/dggsvd.f
-    DEPRECATED/dggsvp.f DEPRECATED/dlahrd.f DEPRECATED/dlatzm.f DEPRECATED/dtzrqf.f )
+    DEPRECATED/dggsvp.f DEPRECATED/dlahrd.f DEPRECATED/dlatzm.f DEPRECATED/dtzrqf.f)
   list(APPEND CLASRC DEPRECATED/cgegs.f DEPRECATED/cgegv.f
     DEPRECATED/cgeqpf.f DEPRECATED/cgelsx.f DEPRECATED/cggsvd.f
     DEPRECATED/cggsvp.f DEPRECATED/clahrd.f DEPRECATED/clatzm.f DEPRECATED/ctzrqf.f)
   list(APPEND ZLASRC DEPRECATED/zgegs.f DEPRECATED/zgegv.f
     DEPRECATED/zgeqpf.f DEPRECATED/zgelsx.f DEPRECATED/zggsvd.f
     DEPRECATED/zggsvp.f DEPRECATED/zlahrd.f DEPRECATED/zlatzm.f DEPRECATED/ztzrqf.f)
-	message(STATUS "Building deprecated routines")
+  message(STATUS "Building deprecated routines")
 endif()
 
 if(BUILD_SINGLE)
-set(ALLOBJ  ${SLASRC} ${ALLAUX}	${SCLAUX} )
-message(STATUS "Building Single Precision")
+  set(ALLOBJ ${SLASRC} ${ALLAUX} ${SCLAUX})
+  message(STATUS "Building Single Precision")
 endif()
 if(BUILD_DOUBLE)
   set(ALLOBJ ${ALLOBJ} ${DLASRC} ${ALLAUX} ${DZLAUX} ${DSLASRC})
-message(STATUS "Building Double Precision")
+  message(STATUS "Building Double Precision")
 endif()
 if(BUILD_COMPLEX)
-  set(ALLOBJ ${ALLOBJ} ${CLASRC} ${ALLAUX} ${SCLAUX} )
-message(STATUS "Building Complex Precision")
+  set(ALLOBJ ${ALLOBJ} ${CLASRC} ${ALLAUX} ${SCLAUX})
+  message(STATUS "Building Complex Precision")
 endif()
 if(BUILD_COMPLEX16)
-  set(ALLOBJ  ${ALLOBJ} ${ZLASRC} ${ALLAUX} ${DZLAUX} ${ZCLASRC})
-message(STATUS "Building Double Complex Precision")
+  set(ALLOBJ ${ALLOBJ} ${ZLASRC} ${ALLAUX} ${DZLAUX} ${ZCLASRC})
+  message(STATUS "Building Double Complex Precision")
 endif()
 
-if (NOT ALLOBJ)
-    message(FATAL_ERROR "-->LAPACK SRC BUILD: NOTHING TO BUILD, NO PRECISION SELECTED:
+if(NOT ALLOBJ)
+  message(FATAL_ERROR "-->LAPACK SRC BUILD: NOTHING TO BUILD, NO PRECISION SELECTED:
      PLEASE ENABLE AT LEAST ONE OF THOSE: BUILD_SINGLE, BUILD_COMPLEX, BUILD_DOUBLE, BUILD_COMPLEX16.")
 endif()
 
diff --git a/SRC/Makefile b/SRC/Makefile
index 9bb40582..e5703733 100644
--- a/SRC/Makefile
+++ b/SRC/Makefile
@@ -28,7 +28,7 @@ include ../make.inc
 #       ZXLASRC -- Double precision complex LAPACK routines using extra
 #                  precision.
 #
-#	      DEPRECATED -- Deprecated routines in all precisions
+#    DEPRECATED -- Deprecated routines in all precisions
 #
 #  The library can be set up to include routines for any combination
 #  of the four precisions.  To create or add to the library, enter make
@@ -56,9 +56,9 @@ include ../make.inc
 #
 #######################################################################
 
-ALLAUX = ilaenv.o ieeeck.o lsamen.o xerbla.o xerbla_array.o iparmq.o iparam2stage.o	\
-    ilaprec.o ilatrans.o ilauplo.o iladiag.o chla_transtype.o \
-    ../INSTALL/ilaver.o ../INSTALL/lsame.o ../INSTALL/slamch.o
+ALLAUX = ilaenv.o ieeeck.o lsamen.o xerbla.o xerbla_array.o iparmq.o iparam2stage.o\
+   ilaprec.o ilatrans.o ilauplo.o iladiag.o chla_transtype.o \
+   ../INSTALL/ilaver.o ../INSTALL/lsame.o ../INSTALL/slamch.o
 
 SCLAUX = \
    sbdsdc.o \
@@ -76,7 +76,7 @@ SCLAUX = \
    slasr.o  slasrt.o slassq.o slasv2.o spttrf.o sstebz.o sstedc.o \
    ssteqr.o ssterf.o slaisnan.o sisnan.o \
    slartgp.o slartgs.o \
-    ../INSTALL/second_$(TIMER).o
+   ../INSTALL/second_$(TIMER).o
 
 DZLAUX = \
    dbdsdc.o \
@@ -98,7 +98,7 @@ DZLAUX = \
 
 SLASRC = \
    sbdsvdx.o spotrf2.o sgetrf2.o \
-   sgbbrd.o sgbcon.o sgbequ.o sgbrfs.o sgbsv.o  \
+   sgbbrd.o sgbcon.o sgbequ.o sgbrfs.o sgbsv.o \
    sgbsvx.o sgbtf2.o sgbtrf.o sgbtrs.o sgebak.o sgebal.o sgebd2.o \
    sgebrd.o sgecon.o sgeequ.o sgees.o  sgeesx.o sgeev.o  sgeevx.o \
    sgehd2.o sgehrd.o sgelq2.o sgelqf.o \
@@ -109,7 +109,7 @@ SLASRC = \
    sggbak.o sggbal.o sgges.o  sgges3.o sggesx.o \
    sggev.o  sggev3.o sggevx.o \
    sggglm.o sgghrd.o sgghd3.o sgglse.o sggqrf.o \
-   sggrqf.o sggsvd3.o sggsvp3.o sgtcon.o sgtrfs.o sgtsv.o  \
+   sggrqf.o sggsvd3.o sggsvp3.o sgtcon.o sgtrfs.o sgtsv.o \
    sgtsvx.o sgttrf.o sgttrs.o sgtts2.o shgeqz.o \
    shsein.o shseqr.o slabrd.o slacon.o slacn2.o \
    slaein.o slaexc.o slag2.o  slags2.o slagtm.o slagv2.o slahqr.o \
@@ -121,7 +121,7 @@ SLASRC = \
    slaqr0.o slaqr1.o slaqr2.o slaqr3.o slaqr4.o slaqr5.o \
    slaqtr.o slar1v.o slar2v.o ilaslr.o ilaslc.o \
    slarf.o  slarfb.o slarfg.o slarfgp.o slarft.o slarfx.o slarfy.o slargv.o \
-   slarrv.o slartv.o  \
+   slarrv.o slartv.o \
    slarz.o  slarzb.o slarzt.o slaswp.o slasy2.o slasyf.o slasyf_rook.o \
    slasyf_rk.o \
    slatbs.o slatdf.o slatps.o slatrd.o slatrs.o slatrz.o \
@@ -131,11 +131,11 @@ SLASRC = \
    sormbr.o sormhr.o sorml2.o sormlq.o sormql.o sormqr.o sormr2.o \
    sormr3.o sormrq.o sormrz.o sormtr.o spbcon.o spbequ.o spbrfs.o \
    spbstf.o spbsv.o  spbsvx.o \
-   spbtf2.o spbtrf.o spbtrs.o spocon.o spoequ.o sporfs.o sposv.o  \
-   sposvx.o spotf2.o  spotri.o  spstrf.o spstf2.o \
+   spbtf2.o spbtrf.o spbtrs.o spocon.o spoequ.o sporfs.o sposv.o \
+   sposvx.o spotf2.o spotri.o spstrf.o spstf2.o \
    sppcon.o sppequ.o \
    spprfs.o sppsv.o  sppsvx.o spptrf.o spptri.o spptrs.o sptcon.o \
-   spteqr.o sptrfs.o sptsv.o  sptsvx.o spttrs.o sptts2.o srscl.o  \
+   spteqr.o sptrfs.o sptsv.o  sptsvx.o spttrs.o sptts2.o srscl.o \
    ssbev.o  ssbevd.o ssbevx.o ssbgst.o ssbgv.o  ssbgvd.o ssbgvx.o \
    ssbtrd.o sspcon.o sspev.o  sspevd.o sspevx.o sspgst.o \
    sspgv.o  sspgvd.o sspgvx.o ssprfs.o sspsv.o  sspsvx.o ssptrd.o \
@@ -158,7 +158,7 @@ SLASRC = \
    strti2.o strtri.o strtrs.o stzrzf.o sstemr.o \
    slansf.o spftrf.o spftri.o spftrs.o ssfrk.o stfsm.o stftri.o stfttp.o \
    stfttr.o stpttf.o stpttr.o strttf.o strttp.o \
-   sgejsv.o  sgesvj.o  sgsvj0.o  sgsvj1.o \
+   sgejsv.o sgesvj.o sgsvj0.o sgsvj1.o \
    sgeequb.o ssyequb.o spoequb.o sgbequb.o \
    sbbcsd.o slapmr.o sorbdb.o sorbdb1.o sorbdb2.o sorbdb3.o sorbdb4.o \
    sorbdb5.o sorbdb6.o sorcsd.o sorcsd2by1.o \
@@ -175,12 +175,12 @@ SLASRC = \
 DSLASRC = spotrs.o sgetrs.o spotrf.o sgetrf.o
 
 ifdef USEXBLAS
-SXLASRC = sgesvxx.o sgerfsx.o sla_gerfsx_extended.o sla_geamv.o		\
-   sla_gercond.o sla_gerpvgrw.o ssysvxx.o ssyrfsx.o			\
-   sla_syrfsx_extended.o sla_syamv.o sla_syrcond.o sla_syrpvgrw.o	\
-   sposvxx.o sporfsx.o sla_porfsx_extended.o sla_porcond.o		\
-   sla_porpvgrw.o sgbsvxx.o sgbrfsx.o sla_gbrfsx_extended.o		\
-   sla_gbamv.o sla_gbrcond.o sla_gbrpvgrw.o sla_lin_berr.o slarscl2.o	\
+SXLASRC = sgesvxx.o sgerfsx.o sla_gerfsx_extended.o sla_geamv.o \
+   sla_gercond.o sla_gerpvgrw.o ssysvxx.o ssyrfsx.o \
+   sla_syrfsx_extended.o sla_syamv.o sla_syrcond.o sla_syrpvgrw.o \
+   sposvxx.o sporfsx.o sla_porfsx_extended.o sla_porcond.o \
+   sla_porpvgrw.o sgbsvxx.o sgbrfsx.o sla_gbrfsx_extended.o \
+   sla_gbamv.o sla_gbrcond.o sla_gbrpvgrw.o sla_lin_berr.o slarscl2.o \
    slascl2.o sla_wwaddw.o
 endif
 
@@ -196,10 +196,10 @@ CLASRC = \
    cgesvj.o cgejsv.o cgsvj0.o cgsvj1.o \
    cgesvx.o cgetc2.o cgetf2.o cgetri.o \
    cggbak.o cggbal.o cgges.o  cgges3.o cggesx.o \
-   cggev.o  cggev3.o cggevx.o cggglm.o\
+   cggev.o  cggev3.o cggevx.o cggglm.o \
    cgghrd.o cgghd3.o cgglse.o cggqrf.o cggrqf.o \
    cggsvd3.o cggsvp3.o \
-   cgtcon.o cgtrfs.o cgtsv.o  cgtsvx.o cgttrf.o cgttrs.o cgtts2.o chbev.o  \
+   cgtcon.o cgtrfs.o cgtsv.o  cgtsvx.o cgttrf.o cgttrs.o cgtts2.o chbev.o \
    chbevd.o chbevx.o chbgst.o chbgv.o  chbgvd.o chbgvx.o chbtrd.o \
    checon.o cheev.o  cheevd.o cheevr.o cheevx.o chegs2.o chegst.o \
    chegv.o  chegvd.o chegvx.o cherfs.o chesv.o  chesvx.o chetd2.o \
@@ -212,7 +212,7 @@ CLASRC = \
    chetrs_3.o checon_3.o chesv_rk.o \
    chesv_aa.o chetrf_aa.o chetrs_aa.o clahef_aa.o\
    chgeqz.o chpcon.o chpev.o  chpevd.o \
-   chpevx.o chpgst.o chpgv.o  chpgvd.o chpgvx.o chprfs.o chpsv.o  \
+   chpevx.o chpgst.o chpgv.o  chpgvd.o chpgvx.o chprfs.o chpsv.o \
    chpsvx.o \
    chptrd.o chptrf.o chptri.o chptrs.o chsein.o chseqr.o clabrd.o \
    clacgv.o clacon.o clacn2.o clacp2.o clacpy.o clacrm.o clacrt.o cladiv.o \
@@ -231,16 +231,16 @@ CLASRC = \
    clarz.o  clarzb.o clarzt.o clascl.o claset.o clasr.o  classq.o \
    claswp.o clasyf.o clasyf_rook.o clasyf_rk.o clasyf_aa.o \
    clatbs.o clatdf.o clatps.o clatrd.o clatrs.o clatrz.o \
-   clauu2.o clauum.o cpbcon.o cpbequ.o cpbrfs.o cpbstf.o cpbsv.o  \
+   clauu2.o clauum.o cpbcon.o cpbequ.o cpbrfs.o cpbstf.o cpbsv.o \
    cpbsvx.o cpbtf2.o cpbtrf.o cpbtrs.o cpocon.o cpoequ.o cporfs.o \
    cposv.o  cposvx.o cpotf2.o cpotri.o cpstrf.o cpstf2.o \
    cppcon.o cppequ.o cpprfs.o cppsv.o  cppsvx.o cpptrf.o cpptri.o cpptrs.o \
    cptcon.o cpteqr.o cptrfs.o cptsv.o  cptsvx.o cpttrf.o cpttrs.o cptts2.o \
-   crot.o   cspcon.o cspmv.o  cspr.o   csprfs.o cspsv.o  \
+   crot.o   cspcon.o cspmv.o  cspr.o   csprfs.o cspsv.o \
    cspsvx.o csptrf.o csptri.o csptrs.o csrscl.o cstedc.o \
    cstegr.o cstein.o csteqr.o \
    csycon.o csymv.o \
-   csyr.o csyrfs.o csysv.o  csysvx.o csytf2.o csytrf.o csytri.o csytri2.o csytri2x.o \
+   csyr.o csyrfs.o csysv.o csysvx.o csytf2.o csytrf.o csytri.o csytri2.o csytri2x.o \
    csyswapr.o csytrs.o csytrs2.o \
    csyconv.o csyconvf.o csyconvf_rook.o \
    csytf2_rook.o csytrf_rook.o csytrs_rook.o \
@@ -290,18 +290,18 @@ ZCLASRC = cpotrs.o cgetrs.o cpotrf.o cgetrf.o
 DLASRC = \
    dpotrf2.o dgetrf2.o \
    dbdsvdx.o \
-   dgbbrd.o dgbcon.o dgbequ.o dgbrfs.o dgbsv.o  \
+   dgbbrd.o dgbcon.o dgbequ.o dgbrfs.o dgbsv.o \
    dgbsvx.o dgbtf2.o dgbtrf.o dgbtrs.o dgebak.o dgebal.o dgebd2.o \
    dgebrd.o dgecon.o dgeequ.o dgees.o  dgeesx.o dgeev.o  dgeevx.o \
    dgehd2.o dgehrd.o dgelq2.o dgelqf.o \
    dgels.o  dgelsd.o dgelss.o dgelsy.o dgeql2.o dgeqlf.o \
    dgeqp3.o dgeqr2.o dgeqr2p.o dgeqrf.o dgeqrfp.o dgerfs.o \
-   dgerq2.o dgerqf.o dgesc2.o dgesdd.o dgesv.o  dgesvd.o dgesvdx.o dgesvx.o  \
+   dgerq2.o dgerqf.o dgesc2.o dgesdd.o dgesv.o  dgesvd.o dgesvdx.o dgesvx.o \
    dgetc2.o dgetf2.o dgetrf.o dgetri.o \
    dgetrs.o dggbak.o dggbal.o dgges.o  dgges3.o dggesx.o \
    dggev.o  dggev3.o dggevx.o \
    dggglm.o dgghrd.o dgghd3.o dgglse.o dggqrf.o \
-   dggrqf.o dggsvd3.o dggsvp3.o dgtcon.o dgtrfs.o dgtsv.o  \
+   dggrqf.o dggsvd3.o dggsvp3.o dgtcon.o dgtrfs.o dgtsv.o \
    dgtsvx.o dgttrf.o dgttrs.o dgtts2.o dhgeqz.o \
    dhsein.o dhseqr.o dlabrd.o dlacon.o dlacn2.o \
    dlaein.o dlaexc.o dlag2.o  dlags2.o dlagtm.o dlagv2.o dlahqr.o \
@@ -313,7 +313,7 @@ DLASRC = \
    dlaqr0.o dlaqr1.o dlaqr2.o dlaqr3.o dlaqr4.o dlaqr5.o \
    dlaqtr.o dlar1v.o dlar2v.o iladlr.o iladlc.o \
    dlarf.o  dlarfb.o dlarfg.o dlarfgp.o dlarft.o dlarfx.o dlarfy.o \
-   dlargv.o dlarrv.o dlartv.o  \
+   dlargv.o dlarrv.o dlartv.o \
    dlarz.o  dlarzb.o dlarzt.o dlaswp.o dlasy2.o \
    dlasyf.o dlasyf_rook.o dlasyf_rk.o \
    dlatbs.o dlatdf.o dlatps.o dlatrd.o dlatrs.o dlatrz.o dlauu2.o \
@@ -323,13 +323,13 @@ DLASRC = \
    dormbr.o dormhr.o dorml2.o dormlq.o dormql.o dormqr.o dormr2.o \
    dormr3.o dormrq.o dormrz.o dormtr.o dpbcon.o dpbequ.o dpbrfs.o \
    dpbstf.o dpbsv.o  dpbsvx.o \
-   dpbtf2.o dpbtrf.o dpbtrs.o dpocon.o dpoequ.o dporfs.o dposv.o  \
+   dpbtf2.o dpbtrf.o dpbtrs.o dpocon.o dpoequ.o dporfs.o dposv.o \
    dposvx.o dpotf2.o dpotrf.o dpotri.o dpotrs.o dpstrf.o dpstf2.o \
    dppcon.o dppequ.o \
    dpprfs.o dppsv.o  dppsvx.o dpptrf.o dpptri.o dpptrs.o dptcon.o \
-   dpteqr.o dptrfs.o dptsv.o  dptsvx.o dpttrs.o dptts2.o drscl.o  \
+   dpteqr.o dptrfs.o dptsv.o  dptsvx.o dpttrs.o dptts2.o drscl.o \
    dsbev.o  dsbevd.o dsbevx.o dsbgst.o dsbgv.o  dsbgvd.o dsbgvx.o \
-   dsbtrd.o  dspcon.o dspev.o  dspevd.o dspevx.o dspgst.o \
+   dsbtrd.o dspcon.o dspev.o  dspevd.o dspevx.o dspgst.o \
    dspgv.o  dspgvd.o dspgvx.o dsprfs.o dspsv.o  dspsvx.o dsptrd.o \
    dsptrf.o dsptri.o dsptrs.o dstegr.o dstein.o dstev.o  dstevd.o dstevr.o \
    dstevx.o \
@@ -352,7 +352,7 @@ DLASRC = \
    dsgesv.o dsposv.o dlag2s.o slag2d.o dlat2s.o \
    dlansf.o dpftrf.o dpftri.o dpftrs.o dsfrk.o dtfsm.o dtftri.o dtfttp.o \
    dtfttr.o dtpttf.o dtpttr.o dtrttf.o dtrttp.o \
-   dgejsv.o  dgesvj.o  dgsvj0.o  dgsvj1.o \
+   dgejsv.o dgesvj.o dgsvj0.o dgsvj1.o \
    dgeequb.o dsyequb.o dpoequb.o dgbequb.o \
    dbbcsd.o dlapmr.o dorbdb.o dorbdb1.o dorbdb2.o dorbdb3.o dorbdb4.o \
    dorbdb5.o dorbdb6.o dorcsd.o dorcsd2by1.o \
@@ -367,12 +367,12 @@ DLASRC = \
    dsbev_2stage.o dsbevx_2stage.o dsbevd_2stage.o dsygv_2stage.o
 
 ifdef USEXBLAS
-DXLASRC = dgesvxx.o dgerfsx.o dla_gerfsx_extended.o dla_geamv.o		\
-   dla_gercond.o dla_gerpvgrw.o dsysvxx.o dsyrfsx.o			\
-   dla_syrfsx_extended.o dla_syamv.o dla_syrcond.o dla_syrpvgrw.o	\
-   dposvxx.o dporfsx.o dla_porfsx_extended.o dla_porcond.o		\
-   dla_porpvgrw.o dgbsvxx.o dgbrfsx.o dla_gbrfsx_extended.o		\
-   dla_gbamv.o dla_gbrcond.o dla_gbrpvgrw.o dla_lin_berr.o dlarscl2.o	\
+DXLASRC = dgesvxx.o dgerfsx.o dla_gerfsx_extended.o dla_geamv.o \
+   dla_gercond.o dla_gerpvgrw.o dsysvxx.o dsyrfsx.o \
+   dla_syrfsx_extended.o dla_syamv.o dla_syrcond.o dla_syrpvgrw.o \
+   dposvxx.o dporfsx.o dla_porfsx_extended.o dla_porcond.o \
+   dla_porpvgrw.o dgbsvxx.o dgbrfsx.o dla_gbrfsx_extended.o \
+   dla_gbamv.o dla_gbrcond.o dla_gbrpvgrw.o dla_lin_berr.o dlarscl2.o \
    dlascl2.o dla_wwaddw.o
 endif
 
@@ -388,11 +388,11 @@ ZLASRC = \
    zgesvj.o zgejsv.o zgsvj0.o zgsvj1.o \
    zgesvx.o zgetc2.o zgetf2.o zgetrf.o \
    zgetri.o zgetrs.o \
-   zggbak.o zggbal.o zgges.o  zgges3.o zggesx.o  \
+   zggbak.o zggbal.o zgges.o  zgges3.o zggesx.o \
    zggev.o  zggev3.o zggevx.o zggglm.o \
    zgghrd.o zgghd3.o zgglse.o zggqrf.o zggrqf.o \
    zggsvd3.o zggsvp3.o \
-   zgtcon.o zgtrfs.o zgtsv.o  zgtsvx.o zgttrf.o zgttrs.o zgtts2.o zhbev.o  \
+   zgtcon.o zgtrfs.o zgtsv.o  zgtsvx.o zgttrf.o zgttrs.o zgtts2.o zhbev.o \
    zhbevd.o zhbevx.o zhbgst.o zhbgv.o  zhbgvd.o zhbgvx.o zhbtrd.o \
    zhecon.o zheev.o  zheevd.o zheevr.o zheevx.o zhegs2.o zhegst.o \
    zhegv.o  zhegvd.o zhegvx.o zherfs.o zhesv.o  zhesvx.o zhetd2.o \
@@ -405,7 +405,7 @@ ZLASRC = \
    zhetrs_3.o zhecon_3.o zhesv_rk.o \
    zhesv_aa.o zhetrf_aa.o zhetrs_aa.o zlahef_aa.o \
    zhgeqz.o zhpcon.o zhpev.o  zhpevd.o \
-   zhpevx.o zhpgst.o zhpgv.o  zhpgvd.o zhpgvx.o zhprfs.o zhpsv.o  \
+   zhpevx.o zhpgst.o zhpgv.o  zhpgvd.o zhpgvx.o zhprfs.o zhpsv.o \
    zhpsvx.o \
    zhptrd.o zhptrf.o zhptri.o zhptrs.o zhsein.o zhseqr.o zlabrd.o \
    zlacgv.o zlacon.o zlacn2.o zlacp2.o zlacpy.o zlacrm.o zlacrt.o zladiv.o \
@@ -423,19 +423,19 @@ ZLASRC = \
    zlarcm.o zlarf.o  zlarfb.o \
    zlarfg.o zlarft.o zlarfgp.o \
    zlarfx.o zlarfy.o zlargv.o zlarnv.o zlarrv.o zlartg.o zlartv.o \
-   zlarz.o  zlarzb.o zlarzt.o zlascl.o zlaset.o zlasr.o  \
+   zlarz.o  zlarzb.o zlarzt.o zlascl.o zlaset.o zlasr.o \
    zlassq.o zlaswp.o zlasyf.o zlasyf_rook.o zlasyf_rk.o zlasyf_aa.o \
    zlatbs.o zlatdf.o zlatps.o zlatrd.o zlatrs.o zlatrz.o zlauu2.o \
-   zlauum.o zpbcon.o zpbequ.o zpbrfs.o zpbstf.o zpbsv.o  \
+   zlauum.o zpbcon.o zpbequ.o zpbrfs.o zpbstf.o zpbsv.o \
    zpbsvx.o zpbtf2.o zpbtrf.o zpbtrs.o zpocon.o zpoequ.o zporfs.o \
    zposv.o  zposvx.o zpotf2.o zpotrf.o zpotri.o zpotrs.o zpstrf.o zpstf2.o \
    zppcon.o zppequ.o zpprfs.o zppsv.o  zppsvx.o zpptrf.o zpptri.o zpptrs.o \
    zptcon.o zpteqr.o zptrfs.o zptsv.o  zptsvx.o zpttrf.o zpttrs.o zptts2.o \
-   zrot.o   zspcon.o zspmv.o  zspr.o   zsprfs.o zspsv.o  \
+   zrot.o   zspcon.o zspmv.o  zspr.o   zsprfs.o zspsv.o \
    zspsvx.o zsptrf.o zsptri.o zsptrs.o zdrscl.o zstedc.o \
    zstegr.o zstein.o zsteqr.o \
    zsycon.o zsymv.o \
-   zsyr.o zsyrfs.o zsysv.o  zsysvx.o zsytf2.o zsytrf.o zsytri.o zsytri2.o zsytri2x.o \
+   zsyr.o zsyrfs.o zsysv.o zsysvx.o zsytf2.o zsytrf.o zsytri.o zsytri2.o zsytri2x.o \
    zsyswapr.o zsytrs.o zsytrs2.o \
    zsyconv.o zsyconvf.o zsyconvf_rook.o \
    zsytf2_rook.o zsytrf_rook.o zsytrs_rook.o zsytrs_aa.o \
@@ -470,29 +470,29 @@ ZLASRC = \
    zhbev_2stage.o zhbevx_2stage.o zhbevd_2stage.o zhegv_2stage.o
 
 ifdef USEXBLAS
-ZXLASRC = zgesvxx.o zgerfsx.o zla_gerfsx_extended.o zla_geamv.o		\
-   zla_gercond_c.o zla_gercond_x.o zla_gerpvgrw.o zsysvxx.o zsyrfsx.o	\
-   zla_syrfsx_extended.o zla_syamv.o zla_syrcond_c.o zla_syrcond_x.o	\
-   zla_syrpvgrw.o zposvxx.o zporfsx.o zla_porfsx_extended.o		\
-   zla_porcond_c.o zla_porcond_x.o zla_porpvgrw.o zgbsvxx.o zgbrfsx.o	\
-   zla_gbrfsx_extended.o zla_gbamv.o zla_gbrcond_c.o zla_gbrcond_x.o	\
-   zla_gbrpvgrw.o zhesvxx.o zherfsx.o zla_herfsx_extended.o		\
-   zla_heamv.o zla_hercond_c.o zla_hercond_x.o zla_herpvgrw.o		\
+ZXLASRC = zgesvxx.o zgerfsx.o zla_gerfsx_extended.o zla_geamv.o \
+   zla_gercond_c.o zla_gercond_x.o zla_gerpvgrw.o zsysvxx.o zsyrfsx.o \
+   zla_syrfsx_extended.o zla_syamv.o zla_syrcond_c.o zla_syrcond_x.o \
+   zla_syrpvgrw.o zposvxx.o zporfsx.o zla_porfsx_extended.o \
+   zla_porcond_c.o zla_porcond_x.o zla_porpvgrw.o zgbsvxx.o zgbrfsx.o \
+   zla_gbrfsx_extended.o zla_gbamv.o zla_gbrcond_c.o zla_gbrcond_x.o \
+   zla_gbrpvgrw.o zhesvxx.o zherfsx.o zla_herfsx_extended.o \
+   zla_heamv.o zla_hercond_c.o zla_hercond_x.o zla_herpvgrw.o \
    zla_lin_berr.o zlarscl2.o zlascl2.o zla_wwaddw.o
 endif
 
-DEPRECSRC = DEPRECATED/cgegs.o DEPRECATED/cgegv.o DEPRECATED/cgelsx.o	\
-    DEPRECATED/cgeqpf.o DEPRECATED/cggsvd.o DEPRECATED/cggsvp.o				\
-    DEPRECATED/clahrd.o DEPRECATED/clatzm.o DEPRECATED/ctzrqf.o \
-    DEPRECATED/dgegs.o	DEPRECATED/dgegv.o DEPRECATED/dgelsx.o \
-    DEPRECATED/dgeqpf.o	DEPRECATED/dggsvd.o DEPRECATED/dggsvp.o \
-    DEPRECATED/dlahrd.o DEPRECATED/dlatzm.o	DEPRECATED/dtzrqf.o \
-    DEPRECATED/sgegs.o DEPRECATED/sgegv.o DEPRECATED/sgelsx.o \
-    DEPRECATED/sgeqpf.o DEPRECATED/sggsvd.o	DEPRECATED/sggsvp.o \
-    DEPRECATED/slahrd.o DEPRECATED/slatzm.o DEPRECATED/stzrqf.o	\
-    DEPRECATED/zgegs.o DEPRECATED/zgegv.o DEPRECATED/zgelsx.o \
-    DEPRECATED/zgeqpf.o DEPRECATED/zggsvd.o DEPRECATED/zggsvp.o	\
-	DEPRECATED/zlahrd.o  DEPRECATED/zlatzm.o DEPRECATED/ztzrqf.o
+DEPRECSRC = DEPRECATED/cgegs.o DEPRECATED/cgegv.o DEPRECATED/cgelsx.o \
+   DEPRECATED/cgeqpf.o DEPRECATED/cggsvd.o DEPRECATED/cggsvp.o \
+   DEPRECATED/clahrd.o DEPRECATED/clatzm.o DEPRECATED/ctzrqf.o \
+   DEPRECATED/dgegs.o  DEPRECATED/dgegv.o  DEPRECATED/dgelsx.o \
+   DEPRECATED/dgeqpf.o DEPRECATED/dggsvd.o DEPRECATED/dggsvp.o \
+   DEPRECATED/dlahrd.o DEPRECATED/dlatzm.o DEPRECATED/dtzrqf.o \
+   DEPRECATED/sgegs.o  DEPRECATED/sgegv.o  DEPRECATED/sgelsx.o \
+   DEPRECATED/sgeqpf.o DEPRECATED/sggsvd.o DEPRECATED/sggsvp.o \
+   DEPRECATED/slahrd.o DEPRECATED/slatzm.o DEPRECATED/stzrqf.o \
+   DEPRECATED/zgegs.o  DEPRECATED/zgegv.o  DEPRECATED/zgelsx.o \
+   DEPRECATED/zgeqpf.o DEPRECATED/zggsvd.o DEPRECATED/zggsvp.o \
+   DEPRECATED/zlahrd.o DEPRECATED/zlatzm.o DEPRECATED/ztzrqf.o
 
 ALLOBJ = $(SLASRC) $(DLASRC) $(DSLASRC) $(CLASRC) $(ZLASRC) $(ZCLASRC) \
    $(SCLAUX) $(DZLAUX) $(ALLAUX)
@@ -513,22 +513,22 @@ all: ../$(LAPACKLIB)
 
 single: $(SLASRC) $(DSLASRC) $(SXLASRC) $(SCLAUX) $(ALLAUX)
 	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(SLASRC) $(DSLASRC) \
-	$(SXLASRC) $(SCLAUX) $(ALLAUX) $(ALLXAUX)
+	$(SXLASRC) $(SCLAUX) $(ALLAUX)
 	$(RANLIB) ../$(LAPACKLIB)
 
 complex: $(CLASRC) $(ZCLASRC) $(CXLASRC) $(SCLAUX) $(ALLAUX)
 	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(CLASRC) $(ZCLASRC) \
-	$(CXLASRC) $(SCLAUX) $(ALLAUX) $(ALLXAUX)
+	$(CXLASRC) $(SCLAUX) $(ALLAUX)
 	$(RANLIB) ../$(LAPACKLIB)
 
 double: $(DLASRC) $(DSLASRC) $(DXLASRC) $(DZLAUX) $(ALLAUX)
 	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(DLASRC) $(DSLASRC) \
-	$(DXLASRC) $(DZLAUX) $(ALLAUX) $(ALLXAUX)
+	$(DXLASRC) $(DZLAUX) $(ALLAUX)
 	$(RANLIB) ../$(LAPACKLIB)
 
 complex16: $(ZLASRC) $(ZCLASRC) $(ZXLASRC) $(DZLAUX) $(ALLAUX)
 	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(ZLASRC) $(ZCLASRC) \
-	$(ZXLASRC) $(DZLAUX) $(ALLAUX) $(ALLXAUX)
+	$(ZXLASRC) $(DZLAUX) $(ALLAUX)
 	$(RANLIB) ../$(LAPACKLIB)
 
 $(ALLAUX): $(FRC)
@@ -554,14 +554,14 @@ clean:
 	rm -f *.o DEPRECATED/*.o
 
 .f.o:
-	$(FORTRAN) $(OPTS) -c $< -o $@
+	$(FORTRAN) $(OPTS) -c -o $@ $<
 
 .F.o:
 	$(FORTRAN) $(OPTS) -c $< -o $@
 	
-slaruv.o: slaruv.f ; $(FORTRAN) $(NOOPT) -c $< -o $@
-dlaruv.o: dlaruv.f ; $(FORTRAN) $(NOOPT) -c $< -o $@
-sla_wwaddw.o: sla_wwaddw.f ; $(FORTRAN) $(NOOPT) -c $< -o $@
-dla_wwaddw.o: dla_wwaddw.f ; $(FORTRAN) $(NOOPT) -c $< -o $@
-cla_wwaddw.o: cla_wwaddw.f ; $(FORTRAN) $(NOOPT) -c $< -o $@
-zla_wwaddw.o: zla_wwaddw.f ; $(FORTRAN) $(NOOPT) -c $< -o $@
+slaruv.o: slaruv.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
+dlaruv.o: dlaruv.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
+sla_wwaddw.o: sla_wwaddw.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
+dla_wwaddw.o: dla_wwaddw.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
+cla_wwaddw.o: cla_wwaddw.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
+zla_wwaddw.o: zla_wwaddw.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
diff --git a/SRC/VARIANTS/Makefile b/SRC/VARIANTS/Makefile
index 403a0b23..6db97e95 100644
--- a/SRC/VARIANTS/Makefile
+++ b/SRC/VARIANTS/Makefile
@@ -17,7 +17,7 @@ include ../../make.inc
 #  1065-1081. http://dx.doi.org/10.1137/S0895479896297744
 #######################################################################
 
-VARIANTSDIR=LIB
+VARIANTSDIR = LIB
 
 CHOLRL = cholesky/RL/cpotrf.o cholesky/RL/dpotrf.o cholesky/RL/spotrf.o cholesky/RL/zpotrf.o
 
@@ -29,7 +29,7 @@ LULL = lu/LL/cgetrf.o lu/LL/dgetrf.o lu/LL/sgetrf.o lu/LL/zgetrf.o
 
 LUREC = lu/REC/cgetrf.o lu/REC/dgetrf.o lu/REC/sgetrf.o lu/REC/zgetrf.o
 
-QRLL = qr/LL/cgeqrf.o qr/LL/dgeqrf.o qr/LL/sgeqrf.o qr/LL/zgeqrf.o  qr/LL/sceil.o
+QRLL = qr/LL/cgeqrf.o qr/LL/dgeqrf.o qr/LL/sgeqrf.o qr/LL/zgeqrf.o qr/LL/sceil.o
 
 
 all: cholrl choltop lucr lull lurec qrll
@@ -55,13 +55,13 @@ lurec: $(LUREC)
 	$(RANLIB) $(VARIANTSDIR)/lurec.a
 
 qrll: $(QRLL)
-	$(ARCH) $(ARCHFLAGS) $(VARIANTSDIR)/qrll.a  $(QRLL)
+	$(ARCH) $(ARCHFLAGS) $(VARIANTSDIR)/qrll.a $(QRLL)
 	$(RANLIB) $(VARIANTSDIR)/qrll.a
 
 
 .f.o:
-	$(FORTRAN) $(OPTS) -c $< -o $@
+	$(FORTRAN) $(OPTS) -c -o $@ $<
 
 clean:
 	rm -f $(CHOLRL) $(CHOLTOP) $(LUCR) $(LULL) $(LUREC) $(QRLL) \
-	      $(VARIANTSDIR)/*.a
\ No newline at end of file
+	      $(VARIANTSDIR)/*.a
diff --git a/TESTING/.DS_Store b/TESTING/.DS_Store
deleted file mode 100644
index 96586931..00000000
--- a/TESTING/.DS_Store
+++ /dev/null
diff --git a/TESTING/CMakeLists.txt b/TESTING/CMakeLists.txt
index 6b077255..ec3d8522 100644
--- a/TESTING/CMakeLists.txt
+++ b/TESTING/CMakeLists.txt
@@ -21,7 +21,7 @@ macro(add_lapack_test output input target)
   endif()
 endmacro()
 
-if (BUILD_SINGLE)
+if(BUILD_SINGLE)
 add_lapack_test(stest.out stest.in xlintsts)
 #
 # ======== SINGLE RFP LIN TESTS ========================
@@ -30,68 +30,29 @@ add_lapack_test(stest_rfp.out stest_rfp.in xlintstrfs)
 #
 # ======== SINGLE EIG TESTS ===========================
 #
-
 add_lapack_test(snep.out nep.in xeigtsts)
-
-
 add_lapack_test(ssep.out sep.in xeigtsts)
-
-
 add_lapack_test(sse2.out se2.in xeigtsts)
-
-
 add_lapack_test(ssvd.out svd.in xeigtsts)
-
-
 add_lapack_test(sec.out sec.in xeigtsts)
-
-
 add_lapack_test(sed.out sed.in xeigtsts)
-
-
 add_lapack_test(sgg.out sgg.in xeigtsts)
-
-
 add_lapack_test(sgd.out sgd.in xeigtsts)
-
-
 add_lapack_test(ssb.out ssb.in xeigtsts)
-
-
 add_lapack_test(ssg.out ssg.in xeigtsts)
-
-
 add_lapack_test(sbal.out sbal.in xeigtsts)
-
-
 add_lapack_test(sbak.out sbak.in xeigtsts)
-
-
 add_lapack_test(sgbal.out sgbal.in xeigtsts)
-
-
 add_lapack_test(sgbak.out sgbak.in xeigtsts)
-
-
 add_lapack_test(sbb.out sbb.in xeigtsts)
-
-
 add_lapack_test(sglm.out glm.in xeigtsts)
-
-
 add_lapack_test(sgqr.out gqr.in xeigtsts)
-
-
 add_lapack_test(sgsv.out gsv.in xeigtsts)
-
-
 add_lapack_test(scsd.out csd.in xeigtsts)
-
-
 add_lapack_test(slse.out lse.in xeigtsts)
 endif()
 
-if (BUILD_DOUBLE)
+if(BUILD_DOUBLE)
 #
 # ======== DOUBLE LIN TESTS ===========================
 add_lapack_test(dtest.out dtest.in xlintstd)
@@ -100,136 +61,58 @@ add_lapack_test(dtest.out dtest.in xlintstd)
 add_lapack_test(dtest_rfp.out dtest_rfp.in xlintstrfd)
 #
 # ======== DOUBLE EIG TESTS ===========================
-
 add_lapack_test(dnep.out nep.in xeigtstd)
-
-
 add_lapack_test(dsep.out sep.in xeigtstd)
-
-
 add_lapack_test(dse2.out se2.in xeigtstd)
-
-
 add_lapack_test(dsvd.out svd.in xeigtstd)
-
-
 add_lapack_test(dec.out dec.in xeigtstd)
-
-
 add_lapack_test(ded.out ded.in xeigtstd)
-
-
 add_lapack_test(dgg.out dgg.in xeigtstd)
-
-
 add_lapack_test(dgd.out dgd.in xeigtstd)
-
-
 add_lapack_test(dsb.out dsb.in xeigtstd)
-
-
 add_lapack_test(dsg.out dsg.in xeigtstd)
-
-
 add_lapack_test(dbal.out dbal.in xeigtstd)
-
-
 add_lapack_test(dbak.out dbak.in xeigtstd)
-
-
 add_lapack_test(dgbal.out dgbal.in xeigtstd)
-
-
 add_lapack_test(dgbak.out dgbak.in xeigtstd)
-
-
 add_lapack_test(dbb.out dbb.in xeigtstd)
-
-
 add_lapack_test(dglm.out glm.in xeigtstd)
-
-
 add_lapack_test(dgqr.out gqr.in xeigtstd)
-
-
 add_lapack_test(dgsv.out gsv.in xeigtstd)
-
-
 add_lapack_test(dcsd.out csd.in xeigtstd)
-
-
 add_lapack_test(dlse.out lse.in xeigtstd)
 endif()
 
-if (BUILD_COMPLEX)
+if(BUILD_COMPLEX)
 add_lapack_test(ctest.out ctest.in xlintstc)
 #
 # ======== COMPLEX RFP LIN TESTS ========================
 add_lapack_test(ctest_rfp.out ctest_rfp.in xlintstrfc)
 #
 # ======== COMPLEX EIG TESTS ===========================
-
 add_lapack_test(cnep.out nep.in xeigtstc)
-
-
 add_lapack_test(csep.out sep.in xeigtstc)
-
-
 add_lapack_test(cse2.out se2.in xeigtstc)
-
-
 add_lapack_test(csvd.out svd.in xeigtstc)
-
-
 add_lapack_test(cec.out cec.in xeigtstc)
-
-
 add_lapack_test(ced.out ced.in xeigtstc)
-
-
 add_lapack_test(cgg.out cgg.in xeigtstc)
-
-
 add_lapack_test(cgd.out cgd.in xeigtstc)
-
-
 add_lapack_test(csb.out csb.in xeigtstc)
-
-
 add_lapack_test(csg.out csg.in xeigtstc)
-
-
 add_lapack_test(cbal.out cbal.in xeigtstc)
-
-
 add_lapack_test(cbak.out cbak.in xeigtstc)
-
-
 add_lapack_test(cgbal.out cgbal.in xeigtstc)
-
-
 add_lapack_test(cgbak.out cgbak.in xeigtstc)
-
-
 add_lapack_test(cbb.out cbb.in xeigtstc)
-
-
 add_lapack_test(cglm.out glm.in xeigtstc)
-
-
 add_lapack_test(cgqr.out gqr.in xeigtstc)
-
-
 add_lapack_test(cgsv.out gsv.in xeigtstc)
-
-
 add_lapack_test(ccsd.out csd.in xeigtstc)
-
-
 add_lapack_test(clse.out lse.in xeigtstc)
 endif()
 
-if (BUILD_COMPLEX16)
+if(BUILD_COMPLEX16)
 #
 # ======== COMPLEX16 LIN TESTS ========================
 add_lapack_test(ztest.out ztest.in xlintstz)
@@ -238,83 +121,40 @@ add_lapack_test(ztest.out ztest.in xlintstz)
 add_lapack_test(ztest_rfp.out ztest_rfp.in xlintstrfz)
 #
 # ======== COMPLEX16 EIG TESTS ===========================
-
 add_lapack_test(znep.out nep.in xeigtstz)
-
-
 add_lapack_test(zsep.out sep.in xeigtstz)
-
-
 add_lapack_test(zse2.out se2.in xeigtstz)
-
-
 add_lapack_test(zsvd.out svd.in xeigtstz)
-
-
 add_lapack_test(zec.out zec.in xeigtstz)
-
-
 add_lapack_test(zed.out zed.in xeigtstz)
-
-
 add_lapack_test(zgg.out zgg.in xeigtstz)
-
-
 add_lapack_test(zgd.out zgd.in xeigtstz)
-
-
 add_lapack_test(zsb.out zsb.in xeigtstz)
-
-
 add_lapack_test(zsg.out zsg.in xeigtstz)
-
-
 add_lapack_test(zbal.out zbal.in xeigtstz)
-
-
 add_lapack_test(zbak.out zbak.in xeigtstz)
-
-
 add_lapack_test(zgbal.out zgbal.in xeigtstz)
-
-
 add_lapack_test(zgbak.out zgbak.in xeigtstz)
-
-
 add_lapack_test(zbb.out zbb.in xeigtstz)
-
-
 add_lapack_test(zglm.out glm.in xeigtstz)
-
-
 add_lapack_test(zgqr.out gqr.in xeigtstz)
-
-
 add_lapack_test(zgsv.out gsv.in xeigtstz)
-
-
 add_lapack_test(zcsd.out csd.in xeigtstz)
-
-
 add_lapack_test(zlse.out lse.in xeigtstz)
 endif()
 
 
-if (BUILD_SIMPLE)
-    if (BUILD_DOUBLE)
+if(BUILD_SINGLE AND BUILD_DOUBLE)
 #
 # ======== SINGLE-DOUBLE PROTO LIN TESTS ==============
-        add_lapack_test(dstest.out dstest.in xlintstds)
-    endif()
+  add_lapack_test(dstest.out dstest.in xlintstds)
 endif()
 
 
-if (BUILD_COMPLEX)
-    if (BUILD_COMPLEX16)
+if(BUILD_COMPLEX AND BUILD_COMPLEX16)
 #
 # ======== COMPLEX-COMPLEX16 LIN TESTS ========================
-        add_lapack_test(zctest.out zctest.in xlintstzc)
-    endif()
+  add_lapack_test(zctest.out zctest.in xlintstzc)
 endif()
 
 # ==============================================================================
@@ -322,9 +162,9 @@ endif()
 if(PYTHONINTERP_FOUND)
   message(STATUS "Running Summary")
   execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${LAPACK_SOURCE_DIR}/lapack_testing.py ${LAPACK_BINARY_DIR})
-   add_test(
+  add_test(
     NAME LAPACK_Test_Summary
     WORKING_DIRECTORY ${LAPACK_BINARY_DIR}
     COMMAND ${PYTHON_EXECUTABLE} "lapack_testing.py"
-   )
+    )
 endif()
diff --git a/TESTING/EIG/CMakeLists.txt b/TESTING/EIG/CMakeLists.txt
index b70d7bfb..19fffcd4 100644
--- a/TESTING/EIG/CMakeLists.txt
+++ b/TESTING/EIG/CMakeLists.txt
@@ -43,10 +43,10 @@ set(AEIGTST
    xlaenv.f
    chkxer.f)
 
-set(SCIGTST  slafts.f slahd2.f slasum.f slatb9.f sstech.f sstect.f
+set(SCIGTST slafts.f slahd2.f slasum.f slatb9.f sstech.f sstect.f
    ssvdch.f ssvdct.f ssxt1.f)
 
-set(SEIGTST  schkee.f
+set(SEIGTST schkee.f
    sbdt01.f sbdt02.f sbdt03.f sbdt04.f sbdt05.f
    schkbb.f schkbd.f schkbk.f schkbl.f schkec.f
    schkgg.f schkgk.f schkgl.f schkhs.f schksb.f schkst.f schkst2stg.f schksb2stg.f
@@ -63,7 +63,7 @@ set(SEIGTST  schkee.f
    sort03.f ssbt21.f ssgt01.f sslect.f sspt21.f sstt21.f
    sstt22.f ssyt21.f ssyt22.f)
 
-set(CEIGTST  cchkee.f
+set(CEIGTST cchkee.f
    cbdt01.f cbdt02.f cbdt03.f cbdt05.f
    cchkbb.f cchkbd.f cchkbk.f cchkbl.f cchkec.f
    cchkgg.f cchkgk.f cchkgl.f cchkhb.f cchkhs.f cchkst.f cchkst2stg.f cchkhb2stg.f
@@ -80,10 +80,10 @@ set(CEIGTST  cchkee.f
    csgt01.f cslect.f
    cstt21.f cstt22.f cunt01.f cunt03.f)
 
-set(DZIGTST  dlafts.f dlahd2.f dlasum.f dlatb9.f dstech.f dstect.f
+set(DZIGTST dlafts.f dlahd2.f dlasum.f dlatb9.f dstech.f dstect.f
    dsvdch.f dsvdct.f dsxt1.f)
 
-set(DEIGTST  dchkee.f
+set(DEIGTST dchkee.f
    dbdt01.f dbdt02.f dbdt03.f dbdt04.f dbdt05.f
    dchkbb.f dchkbd.f dchkbk.f dchkbl.f dchkec.f
    dchkgg.f dchkgk.f dchkgl.f dchkhs.f dchksb.f dchkst.f dchkst2stg.f dchksb2stg.f
@@ -100,7 +100,7 @@ set(DEIGTST  dchkee.f
    dort03.f dsbt21.f dsgt01.f dslect.f dspt21.f dstt21.f
    dstt22.f dsyt21.f dsyt22.f)
 
-set(ZEIGTST  zchkee.f
+set(ZEIGTST zchkee.f
    zbdt01.f zbdt02.f zbdt03.f zbdt05.f
    zchkbb.f zchkbd.f zchkbk.f zchkbl.f zchkec.f
    zchkgg.f zchkgk.f zchkgl.f zchkhb.f zchkhs.f zchkst.f zchkst2stg.f zchkhb2stg.f
@@ -117,27 +117,27 @@ set(ZEIGTST  zchkee.f
    zsgt01.f zslect.f
    zstt21.f zstt22.f zunt01.f zunt03.f)
 
-macro(add_eig_executable name )
+macro(add_eig_executable name)
   add_executable(${name} ${ARGN})
   target_link_libraries(${name} tmglib ${LAPACK_LIBRARIES})
 endmacro()
 
-if (BUILD_SINGLE)
+if(BUILD_SINGLE)
 add_eig_executable(xeigtsts ${SEIGTST} ${SCIGTST} ${AEIGTST}
-  ${SECOND_SRC} )
+  ${SECOND_SRC})
 endif()
 
-if (BUILD_COMPLEX)
+if(BUILD_COMPLEX)
 add_eig_executable(xeigtstc ${CEIGTST} ${SCIGTST} ${AEIGTST}
-  ${SECOND_SRC} )
+  ${SECOND_SRC})
 endif()
 
-if (BUILD_DOUBLE)
+if(BUILD_DOUBLE)
 add_eig_executable(xeigtstd ${DEIGTST} ${DZIGTST} ${AEIGTST}
-  ${DSECOND_SRC} )
+  ${DSECOND_SRC})
 endif()
 
-if (BUILD_COMPLEX16)
+if(BUILD_COMPLEX16)
 add_eig_executable(xeigtstz ${ZEIGTST} ${DZIGTST} ${AEIGTST}
-  ${DSECOND_SRC} )
+  ${DSECOND_SRC})
 endif()
diff --git a/TESTING/EIG/Makefile b/TESTING/EIG/Makefile
index 413e2359..eef087d9 100644
--- a/TESTING/EIG/Makefile
+++ b/TESTING/EIG/Makefile
@@ -49,7 +49,7 @@ SCIGTST = slafts.o slahd2.o slasum.o slatb9.o sstech.o sstect.o \
    ssvdch.o ssvdct.o ssxt1.o
 
 SEIGTST = schkee.o \
-   sbdt01.o sbdt02.o sbdt03.o sbdt04.o sbdt05.o\
+   sbdt01.o sbdt02.o sbdt03.o sbdt04.o sbdt05.o \
    schkbb.o schkbd.o schkbk.o schkbl.o schkec.o \
    schkgg.o schkgk.o schkgl.o schkhs.o schksb.o schkst.o schkst2stg.o schksb2stg.o \
    sckcsd.o sckglm.o sckgqr.o sckgsv.o scklse.o scsdts.o \
@@ -66,7 +66,7 @@ SEIGTST = schkee.o \
    sstt22.o ssyt21.o ssyt22.o
 
 CEIGTST = cchkee.o \
-   cbdt01.o cbdt02.o cbdt03.o cbdt05.o\
+   cbdt01.o cbdt02.o cbdt03.o cbdt05.o \
    cchkbb.o cchkbd.o cchkbk.o cchkbl.o cchkec.o \
    cchkgg.o cchkgk.o cchkgl.o cchkhb.o cchkhs.o cchkst.o cchkst2stg.o cchkhb2stg.o \
    cckcsd.o cckglm.o cckgqr.o cckgsv.o ccklse.o ccsdts.o \
@@ -86,7 +86,7 @@ DZIGTST = dlafts.o dlahd2.o dlasum.o dlatb9.o dstech.o dstect.o \
    dsvdch.o dsvdct.o dsxt1.o
 
 DEIGTST = dchkee.o \
-   dbdt01.o dbdt02.o dbdt03.o dbdt04.o dbdt05.o\
+   dbdt01.o dbdt02.o dbdt03.o dbdt04.o dbdt05.o \
    dchkbb.o dchkbd.o dchkbk.o dchkbl.o dchkec.o \
    dchkgg.o dchkgk.o dchkgl.o dchkhs.o dchksb.o dchkst.o dchkst2stg.o dchksb2stg.o \
    dckcsd.o dckglm.o dckgqr.o dckgsv.o dcklse.o dcsdts.o \
@@ -103,7 +103,7 @@ DEIGTST = dchkee.o \
    dstt22.o dsyt21.o dsyt22.o
 
 ZEIGTST = zchkee.o \
-   zbdt01.o zbdt02.o zbdt03.o zbdt05.o\
+   zbdt01.o zbdt02.o zbdt03.o zbdt05.o \
    zchkbb.o zchkbd.o zchkbk.o zchkbl.o zchkec.o \
    zchkgg.o zchkgk.o zchkgl.o zchkhb.o zchkhs.o zchkst.o zchkst2stg.o zchkhb2stg.o \
    zckcsd.o zckglm.o zckgqr.o zckgsv.o zcklse.o zcsdts.o \
@@ -126,25 +126,25 @@ complex: ../xeigtstc
 double: ../xeigtstd
 complex16: ../xeigtstz
 
-../xeigtsts: $(SEIGTST) $(SCIGTST) $(AEIGTST) ../../$(LAPACKLIB); \
-          $(LOADER) $(LOADOPTS) -o xeigtsts \
-          $(SEIGTST) $(SCIGTST) $(AEIGTST) ../../$(TMGLIB) \
-	  ../../$(LAPACKLIB) $(BLASLIB) && mv xeigtsts $@
+../xeigtsts: $(SEIGTST) $(SCIGTST) $(AEIGTST) ../../$(LAPACKLIB)
+	$(LOADER) $(LOADOPTS) -o $@ \
+	$(SEIGTST) $(SCIGTST) $(AEIGTST) ../../$(TMGLIB) \
+	../../$(LAPACKLIB) $(BLASLIB)
 
-../xeigtstc: $(CEIGTST) $(SCIGTST) $(AEIGTST) ../../$(LAPACKLIB); \
-          $(LOADER) $(LOADOPTS) -o xeigtstc \
-          $(CEIGTST) $(SCIGTST) $(AEIGTST) ../../$(TMGLIB) \
-	  ../../$(LAPACKLIB) $(BLASLIB) && mv xeigtstc $@
+../xeigtstc: $(CEIGTST) $(SCIGTST) $(AEIGTST) ../../$(LAPACKLIB)
+	$(LOADER) $(LOADOPTS) -o $@ \
+	$(CEIGTST) $(SCIGTST) $(AEIGTST) ../../$(TMGLIB) \
+	../../$(LAPACKLIB) $(BLASLIB)
 
-../xeigtstd: $(DEIGTST) $(DZIGTST) $(AEIGTST) ../../$(LAPACKLIB); \
-          $(LOADER) $(LOADOPTS) -o xeigtstd \
-          $(DEIGTST) $(DZIGTST) $(AEIGTST) ../../$(TMGLIB) \
-	  ../../$(LAPACKLIB) $(BLASLIB) && mv xeigtstd $@
+../xeigtstd: $(DEIGTST) $(DZIGTST) $(AEIGTST) ../../$(LAPACKLIB)
+	$(LOADER) $(LOADOPTS) -o $@ \
+	$(DEIGTST) $(DZIGTST) $(AEIGTST) ../../$(TMGLIB) \
+	../../$(LAPACKLIB) $(BLASLIB)
 
-../xeigtstz: $(ZEIGTST) $(DZIGTST) $(AEIGTST) ../../$(LAPACKLIB); \
-          $(LOADER) $(LOADOPTS) -o xeigtstz \
-          $(ZEIGTST) $(DZIGTST) $(AEIGTST) ../../$(TMGLIB) \
-	  ../../$(LAPACKLIB) $(BLASLIB) && mv xeigtstz $@
+../xeigtstz: $(ZEIGTST) $(DZIGTST) $(AEIGTST) ../../$(LAPACKLIB)
+	$(LOADER) $(LOADOPTS) -o $@ \
+	$(ZEIGTST) $(DZIGTST) $(AEIGTST) ../../$(TMGLIB) \
+	../../$(LAPACKLIB) $(BLASLIB)
 
 $(AEIGTST): $(FRC)
 $(SCIGTST): $(FRC)
@@ -161,12 +161,13 @@ clean:
 	rm -f *.o
 
 schkee.o: schkee.f
-	$(FORTRAN) $(DRVOPTS) -c $< -o $@
+	$(FORTRAN) $(DRVOPTS) -c -o $@ $<
 dchkee.o: dchkee.f
-	$(FORTRAN) $(DRVOPTS) -c $< -o $@
+	$(FORTRAN) $(DRVOPTS) -c -o $@ $<
 cchkee.o: cchkee.f
-	$(FORTRAN) $(DRVOPTS) -c $< -o $@
+	$(FORTRAN) $(DRVOPTS) -c -o $@ $<
 zchkee.o: zchkee.f
-	$(FORTRAN) $(DRVOPTS) -c $< -o $@
+	$(FORTRAN) $(DRVOPTS) -c -o $@ $<
 
-.f.o : ; $(FORTRAN) $(OPTS) -c $< -o $@
+.f.o:
+	$(FORTRAN) $(OPTS) -c -o $@ $<
diff --git a/TESTING/LIN/CMakeLists.txt b/TESTING/LIN/CMakeLists.txt
index 323fabdf..715f32ec 100644
--- a/TESTING/LIN/CMakeLists.txt
+++ b/TESTING/LIN/CMakeLists.txt
@@ -4,9 +4,9 @@ set(ALINTST
 
 set(SCLNTST slaord.f)
 
-set(DZLNTST dlaord.f )
+set(DZLNTST dlaord.f)
 
-set(SLINTST  schkaa.f
+set(SLINTST schkaa.f
    schkeq.f schkgb.f schkge.f schkgt.f
    schklq.f schkpb.f schkpo.f schkps.f schkpp.f
    schkpt.f schkq3.f schkql.f schkqr.f schkrq.f
@@ -29,7 +29,7 @@ set(SLINTST  schkaa.f
    sqrt01.f sqrt01p.f sqrt02.f sqrt03.f sqrt11.f sqrt12.f
    sqrt13.f sqrt14.f sqrt15.f sqrt16.f sqrt17.f
    srqt01.f srqt02.f srqt03.f srzt01.f srzt02.f
-   sspt01.f ssyt01.f ssyt01_rook.f ssyt01_3.f ssyt01_aa.f 
+   sspt01.f ssyt01.f ssyt01_rook.f ssyt01_3.f ssyt01_aa.f
    stbt02.f stbt03.f stbt05.f stbt06.f stpt01.f
    stpt02.f stpt03.f stpt05.f stpt06.f strt01.f
    strt02.f strt03.f strt05.f strt06.f
@@ -44,7 +44,7 @@ else()
   list(APPEND SLINTST sdrvge.f serrge.f sdrvgb.f sdrvpo.f)
 endif()
 
-set(CLINTST  cchkaa.f
+set(CLINTST cchkaa.f
    cchkeq.f cchkgb.f cchkge.f cchkgt.f
    cchkhe.f cchkhe_rook.f cchkhe_rk.f cchkhe_aa.f cchkhp.f cchklq.f cchkpb.f
    cchkpo.f cchkps.f cchkpp.f cchkpt.f cchkq3.f cchkql.f
@@ -77,9 +77,9 @@ set(CLINTST  cchkaa.f
    ctpt02.f ctpt03.f ctpt05.f ctpt06.f ctrt01.f
    ctrt02.f ctrt03.f ctrt05.f ctrt06.f
    sget06.f cgennd.f
-   cqrt04.f cqrt05.f cchkqrt.f cerrqrt.f cchkqrtp.f cerrqrtp.f 
+   cqrt04.f cqrt05.f cchkqrt.f cerrqrt.f cchkqrtp.f cerrqrtp.f
    cchklqt.f cchklqtp.f cchktsqr.f
-   cerrlqt.f cerrlqtp.f cerrtsqr.f ctsqr01.f clqt04.f clqt05.f )
+   cerrlqt.f cerrlqtp.f cerrtsqr.f ctsqr01.f clqt04.f clqt05.f)
 
 if(USEXBLAS)
   list(APPEND
@@ -88,7 +88,7 @@ else()
   list(APPEND CLINTST cdrvge.f cdrvgb.f cerrge.f cdrvpo.f cerrpo.f)
 endif()
 
-set(DLINTST  dchkaa.f
+set(DLINTST dchkaa.f
    dchkeq.f dchkgb.f dchkge.f dchkgt.f
    dchklq.f dchkpb.f dchkpo.f dchkps.f dchkpp.f
    dchkpt.f dchkq3.f dchkql.f dchkqr.f dchkrq.f
@@ -118,17 +118,17 @@ set(DLINTST  dchkaa.f
    dgennd.f
    dqrt04.f dqrt05.f dchkqrt.f derrqrt.f dchkqrtp.f derrqrtp.f
    dchklq.f dchklqt.f dchklqtp.f dchktsqr.f
-   derrlqt.f derrlqtp.f derrtsqr.f dtsqr01.f dlqt04.f dlqt05.f )
+   derrlqt.f derrlqtp.f derrtsqr.f dtsqr01.f dlqt04.f dlqt05.f)
 
 if(USEXBLAS)
   list(APPEND
-    DLINTST  ddrvgex.f ddrvgbx.f derrgex.f ddrvpox.f derrpox.f debchvxx.f)
+    DLINTST ddrvgex.f ddrvgbx.f derrgex.f ddrvpox.f derrpox.f debchvxx.f)
 else()
   list(APPEND
-    DLINTST  ddrvge.f ddrvgb.f derrge.f ddrvpo.f derrpo.f)
+    DLINTST ddrvge.f ddrvgb.f derrge.f ddrvpo.f derrpo.f)
 endif()
 
-set(ZLINTST  zchkaa.f
+set(ZLINTST zchkaa.f
    zchkeq.f zchkgb.f zchkge.f zchkgt.f
    zchkhe.f zchkhe_rook.f zchkhe_rk.f zchkhe_aa.f zchkhp.f zchklq.f zchkpb.f
    zchkpo.f zchkps.f zchkpp.f zchkpt.f zchkq3.f zchkql.f
@@ -167,69 +167,69 @@ set(ZLINTST  zchkaa.f
 
 if(USEXBLAS)
   list(APPEND
-    ZLINTST  zdrvgex.f zdrvgbx.f zerrgex.f zdrvpox.f zerrpox.f zebchvxx.f)
+    ZLINTST zdrvgex.f zdrvgbx.f zerrgex.f zdrvpox.f zerrpox.f zebchvxx.f)
 else()
   list(APPEND
-    ZLINTST  zdrvge.f zdrvgb.f zerrge.f zdrvpo.f zerrpo.f)
+    ZLINTST zdrvge.f zdrvgb.f zerrge.f zdrvpo.f zerrpo.f)
 endif()
 
-set(DSLINTST  dchkab.f
+set(DSLINTST dchkab.f
 	ddrvab.f ddrvac.f derrab.f derrac.f dget08.f
 	alaerh.f alahd.f  aladhd.f alareq.f
 	chkxer.f dlarhs.f dlatb4.f xerbla.f
 	dget02.f dpot06.f)
 
-set(ZCLINTST  zchkab.f
+set(ZCLINTST zchkab.f
 	zdrvab.f zdrvac.f zerrab.f zerrac.f zget08.f
 	alaerh.f alahd.f  aladhd.f alareq.f
 	chkxer.f zget02.f zlarhs.f zlatb4.f
 	zsbmv.f  xerbla.f zpot06.f zlaipd.f)
 
-set(SLINTSTRFP  schkrfp.f sdrvrfp.f sdrvrf1.f sdrvrf2.f sdrvrf3.f sdrvrf4.f serrrfp.f
+set(SLINTSTRFP schkrfp.f sdrvrfp.f sdrvrf1.f sdrvrf2.f sdrvrf3.f sdrvrf4.f serrrfp.f
 	slatb4.f slarhs.f sget04.f spot01.f spot03.f spot02.f
-	chkxer.f xerbla.f alaerh.f aladhd.f alahd.f alasvm.f )
+	chkxer.f xerbla.f alaerh.f aladhd.f alahd.f alasvm.f)
 
-set(DLINTSTRFP  dchkrfp.f ddrvrfp.f ddrvrf1.f ddrvrf2.f ddrvrf3.f ddrvrf4.f derrrfp.f
+set(DLINTSTRFP dchkrfp.f ddrvrfp.f ddrvrf1.f ddrvrf2.f ddrvrf3.f ddrvrf4.f derrrfp.f
 	dlatb4.f dlarhs.f dget04.f dpot01.f dpot03.f dpot02.f
-	chkxer.f xerbla.f alaerh.f aladhd.f alahd.f alasvm.f )
+	chkxer.f xerbla.f alaerh.f aladhd.f alahd.f alasvm.f)
 
-set(CLINTSTRFP  cchkrfp.f cdrvrfp.f cdrvrf1.f cdrvrf2.f cdrvrf3.f cdrvrf4.f cerrrfp.f
+set(CLINTSTRFP cchkrfp.f cdrvrfp.f cdrvrf1.f cdrvrf2.f cdrvrf3.f cdrvrf4.f cerrrfp.f
   claipd.f clatb4.f clarhs.f csbmv.f cget04.f cpot01.f cpot03.f cpot02.f
-  chkxer.f xerbla.f alaerh.f aladhd.f alahd.f alasvm.f )
+  chkxer.f xerbla.f alaerh.f aladhd.f alahd.f alasvm.f)
 
-set(ZLINTSTRFP  zchkrfp.f zdrvrfp.f zdrvrf1.f zdrvrf2.f zdrvrf3.f zdrvrf4.f zerrrfp.f
+set(ZLINTSTRFP zchkrfp.f zdrvrfp.f zdrvrf1.f zdrvrf2.f zdrvrf3.f zdrvrf4.f zerrrfp.f
   zlatb4.f zlaipd.f zlarhs.f zsbmv.f zget04.f zpot01.f zpot03.f zpot02.f
-  chkxer.f xerbla.f alaerh.f aladhd.f alahd.f alasvm.f )
+  chkxer.f xerbla.f alaerh.f aladhd.f alahd.f alasvm.f)
 
-macro(add_lin_executable name )
+macro(add_lin_executable name)
   add_executable(${name} ${ARGN})
   target_link_libraries(${name} tmglib ${LAPACK_LIBRARIES})
 endmacro()
 
 if(BUILD_SINGLE)
-add_lin_executable(xlintsts ${ALINTST} ${SCLNTST} ${SLINTST} ${SECOND_SRC} )
-add_lin_executable(xlintstrfs ${SLINTSTRFP} ${SECOND_SRC})
+  add_lin_executable(xlintsts ${ALINTST} ${SCLNTST} ${SLINTST} ${SECOND_SRC})
+  add_lin_executable(xlintstrfs ${SLINTSTRFP} ${SECOND_SRC})
 endif()
 
 if(BUILD_DOUBLE)
-add_lin_executable(xlintstd  ${ALINTST} ${DLINTST} ${DZLNTST} ${DSECOND_SRC})
-add_lin_executable(xlintstrfd ${DLINTSTRFP} ${DSECOND_SRC})
+  add_lin_executable(xlintstd ${ALINTST} ${DLINTST} ${DZLNTST} ${DSECOND_SRC})
+  add_lin_executable(xlintstrfd ${DLINTSTRFP} ${DSECOND_SRC})
 endif()
 
 if(BUILD_SINGLE AND BUILD_DOUBLE)
-add_lin_executable(xlintstds ${DSLINTST} ${SECOND_SRC} ${DSECOND_SRC} )
+  add_lin_executable(xlintstds ${DSLINTST} ${SECOND_SRC} ${DSECOND_SRC})
 endif()
 
 if(BUILD_COMPLEX)
-add_lin_executable(xlintstc  ${ALINTST} ${CLINTST} ${SCLNTST} ${SECOND_SRC} )
-add_lin_executable(xlintstrfc  ${CLINTSTRFP} ${SECOND_SRC})
+  add_lin_executable(xlintstc ${ALINTST} ${CLINTST} ${SCLNTST} ${SECOND_SRC})
+  add_lin_executable(xlintstrfc ${CLINTSTRFP} ${SECOND_SRC})
 endif()
 
 if(BUILD_COMPLEX16)
-add_lin_executable(xlintstz  ${ALINTST} ${ZLINTST} ${DZLNTST} ${DSECOND_SRC})
-add_lin_executable(xlintstrfz ${ZLINTSTRFP} ${DSECOND_SRC})
+  add_lin_executable(xlintstz ${ALINTST} ${ZLINTST} ${DZLNTST} ${DSECOND_SRC})
+  add_lin_executable(xlintstrfz ${ZLINTSTRFP} ${DSECOND_SRC})
 endif()
 
 if(BUILD_COMPLEX AND BUILD_COMPLEX16)
-add_lin_executable(xlintstzc ${ZCLINTST} ${SECOND_SRC} ${DSECOND_SRC} )
+  add_lin_executable(xlintstzc ${ZCLINTST} ${SECOND_SRC} ${DSECOND_SRC})
 endif()
diff --git a/TESTING/LIN/Makefile b/TESTING/LIN/Makefile
index 879cee2e..bd188b20 100644
--- a/TESTING/LIN/Makefile
+++ b/TESTING/LIN/Makefile
@@ -35,7 +35,7 @@ include ../../make.inc
 #######################################################################
 
 ifneq ($(strip $(VARLIB)),)
-    LAPACKLIB :=  $(VARLIB) ../../$(LAPACKLIB)
+    LAPACKLIB := $(VARLIB) ../../$(LAPACKLIB)
 endif
 
 
@@ -43,9 +43,9 @@ ALINTST = \
    aladhd.o alaerh.o alaesm.o alahd.o alareq.o \
    alasum.o alasvm.o chkxer.o icopy.o ilaenv.o xlaenv.o xerbla.o
 
-SCLNTST= slaord.o
+SCLNTST = slaord.o
 
-DZLNTST= dlaord.o
+DZLNTST = dlaord.o
 
 SLINTST = schkaa.o \
    schkeq.o schkgb.o schkge.o schkgt.o \
@@ -54,7 +54,7 @@ SLINTST = schkaa.o \
    schksp.o schksy.o schksy_rook.o schksy_rk.o schksy_aa.o schktb.o schktp.o schktr.o \
    schktz.o \
    sdrvgt.o sdrvls.o sdrvpb.o \
-   sdrvpp.o sdrvpt.o sdrvsp.o sdrvsy_rook.o sdrvsy_rk.o  sdrvsy_aa.o\
+   sdrvpp.o sdrvpt.o sdrvsp.o sdrvsy_rook.o sdrvsy_rk.o  sdrvsy_aa.o \
    serrgt.o serrlq.o serrls.o \
    serrps.o serrql.o serrqp.o serrqr.o \
    serrrq.o serrtr.o serrtz.o \
@@ -70,13 +70,13 @@ SLINTST = schkaa.o \
    sqrt01.o sqrt01p.o sqrt02.o sqrt03.o sqrt11.o sqrt12.o \
    sqrt13.o sqrt14.o sqrt15.o sqrt16.o sqrt17.o \
    srqt01.o srqt02.o srqt03.o srzt01.o srzt02.o \
-   sspt01.o ssyt01.o ssyt01_rook.o ssyt01_3.o ssyt01_aa.o\
+   sspt01.o ssyt01.o ssyt01_rook.o ssyt01_3.o ssyt01_aa.o \
    stbt02.o stbt03.o stbt05.o stbt06.o stpt01.o \
    stpt02.o stpt03.o stpt05.o stpt06.o strt01.o \
    strt02.o strt03.o strt05.o strt06.o \
    sgennd.o sqrt04.o sqrt05.o schkqrt.o serrqrt.o schkqrtp.o serrqrtp.o \
    schklqt.o schklqtp.o schktsqr.o \
-   serrlqt.o serrlqtp.o serrtsqr.o stsqr01.o slqt04.o slqt05.o 
+   serrlqt.o serrlqtp.o serrtsqr.o stsqr01.o slqt04.o slqt05.o
 
 ifdef USEXBLAS
 SLINTST += serrvxx.o sdrvgex.o sdrvsyx.o serrgex.o sdrvgbx.o sdrvpox.o \
@@ -120,7 +120,7 @@ CLINTST = cchkaa.o \
    sget06.o cgennd.o \
    cqrt04.o cqrt05.o cchkqrt.o cerrqrt.o cchkqrtp.o cerrqrtp.o \
    cchklqt.o cchklqtp.o cchktsqr.o \
-   cerrlqt.o cerrlqtp.o cerrtsqr.o ctsqr01.o clqt04.o clqt05.o 
+   cerrlqt.o cerrlqtp.o cerrtsqr.o ctsqr01.o clqt04.o clqt05.o
 
 ifdef USEXBLAS
 CLINTST += cerrvxx.o cdrvgex.o cdrvsyx.o cdrvgbx.o cerrgex.o cdrvpox.o \
@@ -150,17 +150,17 @@ DLINTST = dchkaa.o \
    dpot02.o dpot03.o dpot05.o dpst01.o dppt01.o \
    dppt02.o dppt03.o dppt05.o dptt01.o dptt02.o \
    dptt05.o dqlt01.o dqlt02.o dqlt03.o dqpt01.o \
-   dqrt01.o dqrt01p.o  dqrt02.o dqrt03.o dqrt11.o dqrt12.o \
+   dqrt01.o dqrt01p.o dqrt02.o dqrt03.o dqrt11.o dqrt12.o \
    dqrt13.o dqrt14.o dqrt15.o dqrt16.o dqrt17.o \
    drqt01.o drqt02.o drqt03.o drzt01.o drzt02.o \
-   dspt01.o dsyt01.o dsyt01_rook.o dsyt01_3.o dsyt01_aa.o\
+   dspt01.o dsyt01.o dsyt01_rook.o dsyt01_3.o dsyt01_aa.o \
    dtbt02.o dtbt03.o dtbt05.o dtbt06.o dtpt01.o \
    dtpt02.o dtpt03.o dtpt05.o dtpt06.o dtrt01.o \
    dtrt02.o dtrt03.o dtrt05.o dtrt06.o \
    dgennd.o \
    dqrt04.o dqrt05.o dchkqrt.o derrqrt.o dchkqrtp.o derrqrtp.o \
    dchklq.o dchklqt.o dchklqtp.o dchktsqr.o \
-   derrlqt.o derrlqtp.o derrtsqr.o dtsqr01.o dlqt04.o dlqt05.o 
+   derrlqt.o derrlqtp.o derrtsqr.o dtsqr01.o dlqt04.o dlqt05.o
 
 ifdef USEXBLAS
 DLINTST += derrvxx.o ddrvgex.o ddrvsyx.o ddrvgbx.o derrgex.o ddrvpox.o derrpox.o \
@@ -215,13 +215,13 @@ ZLINTST += zerrvx.o zdrvge.o zdrvsy.o zdrvgb.o zerrge.o zdrvpo.o \
 endif
 
 DSLINTST = dchkab.o \
-	ddrvab.o ddrvac.o derrab.o derrac.o dget08.o          \
+	ddrvab.o ddrvac.o derrab.o derrac.o dget08.o \
 	alaerh.o alahd.o  aladhd.o alareq.o \
 	chkxer.o dlarhs.o dlatb4.o xerbla.o \
 	dget02.o dpot06.o
 
 ZCLINTST = zchkab.o \
-	zdrvab.o zdrvac.o zerrab.o zerrac.o zget08.o          \
+	zdrvab.o zdrvac.o zerrab.o zerrac.o zget08.o \
 	alaerh.o alahd.o  aladhd.o alareq.o \
 	chkxer.o zget02.o zlarhs.o zlatb4.o \
 	zsbmv.o  xerbla.o zpot06.o zlaipd.o
@@ -242,7 +242,7 @@ ZLINTSTRFP = zchkrfp.o zdrvrfp.o zdrvrf1.o zdrvrf2.o zdrvrf3.o zdrvrf4.o zerrrfp
 	zlatb4.o zlaipd.o zlarhs.o zsbmv.o zget04.o zpot01.o zpot03.o zpot02.o \
 	chkxer.o xerbla.o alaerh.o aladhd.o alahd.o alasvm.o
 
-all:  single double complex complex16 proto-single proto-double proto-complex proto-complex16
+all: single double complex complex16 proto-single proto-double proto-complex proto-complex16
 
 single: ../xlintsts
 double: ../xlintstd
@@ -254,75 +254,45 @@ proto-double: ../xlintstds ../xlintstrfd
 proto-complex: ../xlintstrfc
 proto-complex16: ../xlintstzc ../xlintstrfz
 
-xlintsts : $(ALINTST) $(SLINTST) $(SCLNTST) ../../$(LAPACKLIB)
-	$(LOADER) $(LOADOPTS)  $(ALINTST) $(SCLNTST) $(SLINTST) \
-        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) -o $@
+../xlintsts: $(ALINTST) $(SLINTST) $(SCLNTST) ../../$(LAPACKLIB)
+	$(LOADER) $(LOADOPTS) -o $@ $(ALINTST) $(SCLNTST) $(SLINTST) \
+	../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB) $(BLASLIB)
 
-xlintstc : $(ALINTST) $(CLINTST) $(SCLNTST) ../../$(LAPACKLIB)
-	$(LOADER) $(LOADOPTS)  $(ALINTST) $(SCLNTST) $(CLINTST) \
-        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) -o $@
+../xlintstc: $(ALINTST) $(CLINTST) $(SCLNTST) ../../$(LAPACKLIB)
+	$(LOADER) $(LOADOPTS) -o $@ $(ALINTST) $(SCLNTST) $(CLINTST) \
+	../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB) $(BLASLIB)
 
-xlintstd : $(ALINTST) $(DLINTST) $(DZLNTST) ../../$(LAPACKLIB)
-	$(LOADER) $(LOADOPTS) $^ \
-        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB) $(BLASLIB) -o $@
+../xlintstd: $(ALINTST) $(DLINTST) $(DZLNTST) ../../$(LAPACKLIB)
+	$(LOADER) $(LOADOPTS) -o $@ $^ \
+	../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB) $(BLASLIB)
 
-xlintstz : $(ALINTST) $(ZLINTST) $(DZLNTST) ../../$(LAPACKLIB)
-	$(LOADER) $(LOADOPTS)  $(ALINTST) $(DZLNTST) $(ZLINTST) \
-        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) -o $@
+../xlintstz: $(ALINTST) $(ZLINTST) $(DZLNTST) ../../$(LAPACKLIB)
+	$(LOADER) $(LOADOPTS) -o $@ $(ALINTST) $(DZLNTST) $(ZLINTST) \
+	../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB) $(BLASLIB)
 
-xlintstds : $(DSLINTST) ../../$(LAPACKLIB)
-	$(LOADER) $(LOADOPTS)  $(DSLINTST) \
-        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o $@
+../xlintstds: $(DSLINTST) ../../$(LAPACKLIB)
+	$(LOADER) $(LOADOPTS) -o $@ $(DSLINTST) \
+	../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB)
 
-xlintstzc : $(ZCLINTST) ../../$(LAPACKLIB)
-	$(LOADER) $(LOADOPTS)  $(ZCLINTST) \
-        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o $@
+../xlintstzc: $(ZCLINTST) ../../$(LAPACKLIB)
+	$(LOADER) $(LOADOPTS) -o $@ $(ZCLINTST) \
+	../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB)
 
-xlintstrfs : $(SLINTSTRFP) ../../$(LAPACKLIB)
-	$(LOADER) $(LOADOPTS)  $(SLINTSTRFP) \
-        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o $@
+../xlintstrfs: $(SLINTSTRFP) ../../$(LAPACKLIB)
+	$(LOADER) $(LOADOPTS) -o $@ $(SLINTSTRFP) \
+	../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB)
 
-xlintstrfd : $(DLINTSTRFP) ../../$(LAPACKLIB)
-	$(LOADER) $(LOADOPTS)  $(DLINTSTRFP) \
-        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o $@
+../xlintstrfd: $(DLINTSTRFP) ../../$(LAPACKLIB)
+	$(LOADER) $(LOADOPTS) -o $@ $(DLINTSTRFP) \
+	../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB)
 
-xlintstrfc : $(CLINTSTRFP) ../../$(LAPACKLIB)
-	$(LOADER) $(LOADOPTS)  $(CLINTSTRFP) \
-        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o $@
+../xlintstrfc: $(CLINTSTRFP) ../../$(LAPACKLIB)
+	$(LOADER) $(LOADOPTS) -o $@ $(CLINTSTRFP) \
+	../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB)
 
-xlintstrfz : $(ZLINTSTRFP) ../../$(LAPACKLIB)
-	$(LOADER) $(LOADOPTS)  $(ZLINTSTRFP) \
-        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o $@
-
-../xlintsts: xlintsts
-	mv xlintsts $@
-
-../xlintstc: xlintstc
-	mv xlintstc $@
-
-../xlintstz: xlintstz
-	mv xlintstz $@
-
-../xlintstd: xlintstd
-	mv xlintstd $@
-
-../xlintstds: xlintstds
-	mv xlintstds $@
-
-../xlintstzc: xlintstzc
-	mv xlintstzc $@
-
-../xlintstrfs: xlintstrfs
-	mv xlintstrfs $@
-
-../xlintstrfc: xlintstrfc
-	mv xlintstrfc $@
-
-../xlintstrfd: xlintstrfd
-	mv xlintstrfd $@
-
-../xlintstrfz: xlintstrfz
-	mv xlintstrfz $@
+../xlintstrfz: $(ZLINTSTRFP) ../../$(LAPACKLIB)
+	$(LOADER) $(LOADOPTS) -o $@ $(ZLINTSTRFP) \
+	../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB)
 
 $(ALINTST): $(FRC)
 $(SCLNTST): $(FRC)
@@ -339,15 +309,15 @@ clean:
 	rm -f *.o
 
 schkaa.o: schkaa.f
-	$(FORTRAN) $(DRVOPTS) -c $< -o $@
+	$(FORTRAN) $(DRVOPTS) -c -o $@ $<
 dchkaa.o: dchkaa.f
-	$(FORTRAN) $(DRVOPTS) -c $< -o $@
+	$(FORTRAN) $(DRVOPTS) -c -o $@ $<
 cchkaa.o: cchkaa.f
-	$(FORTRAN) $(DRVOPTS) -c $< -o $@
+	$(FORTRAN) $(DRVOPTS) -c -o $@ $<
 zchkaa.o: zchkaa.f
-	$(FORTRAN) $(DRVOPTS) -c $< -o $@
+	$(FORTRAN) $(DRVOPTS) -c -o $@ $<
 
 .f.o:
-	$(FORTRAN) $(OPTS) -c $< -o $@
+	$(FORTRAN) $(OPTS) -c -o $@ $<
 
 .NOTPARALLEL:
diff --git a/TESTING/MATGEN/CMakeLists.txt b/TESTING/MATGEN/CMakeLists.txt
index 011aea15..09b6e3b4 100644
--- a/TESTING/MATGEN/CMakeLists.txt
+++ b/TESTING/MATGEN/CMakeLists.txt
@@ -31,23 +31,23 @@
 #
 #######################################################################
 
-set(SCATGEN  slatm1.f slaran.f slarnd.f)
+set(SCATGEN slatm1.f slaran.f slarnd.f)
 
-set(SMATGEN  slatms.f slatme.f slatmr.f slatmt.f
+set(SMATGEN slatms.f slatme.f slatmr.f slatmt.f
    slagge.f slagsy.f slakf2.f slarge.f slaror.f slarot.f slatm2.f
    slatm3.f slatm5.f slatm6.f slatm7.f slahilb.f)
 
-set(CMATGEN  clatms.f clatme.f clatmr.f clatmt.f
+set(CMATGEN clatms.f clatme.f clatmr.f clatmt.f
    clagge.f claghe.f clagsy.f clakf2.f clarge.f claror.f clarot.f
    clatm1.f clarnd.f clatm2.f clatm3.f clatm5.f clatm6.f clahilb.f slatm7.f)
 
-set(DZATGEN  dlatm1.f dlaran.f dlarnd.f)
+set(DZATGEN dlatm1.f dlaran.f dlarnd.f)
 
-set(DMATGEN  dlatms.f dlatme.f dlatmr.f dlatmt.f
+set(DMATGEN dlatms.f dlatme.f dlatmr.f dlatmt.f
    dlagge.f dlagsy.f dlakf2.f dlarge.f dlaror.f dlarot.f dlatm2.f
    dlatm3.f dlatm5.f dlatm6.f dlatm7.f dlahilb.f)
 
-set(ZMATGEN  zlatms.f zlatme.f zlatmr.f zlatmt.f
+set(ZMATGEN zlatms.f zlatme.f zlatmr.f zlatmt.f
   zlagge.f zlaghe.f zlagsy.f zlakf2.f zlarge.f zlaror.f zlarot.f
   zlatm1.f zlarnd.f zlatm2.f zlatm3.f zlatm5.f zlatm6.f zlahilb.f dlatm7.f)
 
@@ -58,18 +58,18 @@ if(BUILD_DOUBLE)
   set(ALLOBJ ${ALLOBJ} ${DMATGEN} ${DZATGEN})
 endif()
 if(BUILD_COMPLEX)
-  set(ALLOBJ  ${ALLOBJ} ${CMATGEN} ${SCATGEN})
+  set(ALLOBJ ${ALLOBJ} ${CMATGEN} ${SCATGEN})
 endif()
 if(BUILD_COMPLEX16)
   set(ALLOBJ ${ALLOBJ} ${ZMATGEN} ${DZATGEN})
 endif()
 
-if (NOT ALLOBJ)
-set(ALLOBJ ${SMATGEN} ${CMATGEN} ${SCATGEN} ${DMATGEN} ${ZMATGEN}
-  ${DZATGEN})
+if(NOT ALLOBJ)
+  set(ALLOBJ ${SMATGEN} ${CMATGEN} ${SCATGEN} ${DMATGEN} ${ZMATGEN}
+    ${DZATGEN})
 else()
   list(REMOVE_DUPLICATES ALLOBJ)
 endif()
-add_library(tmglib ${ALLOBJ} )
+add_library(tmglib ${ALLOBJ})
 target_link_libraries(tmglib ${LAPACK_LIBRARIES})
 lapack_install_library(tmglib)
diff --git a/TESTING/MATGEN/Makefile b/TESTING/MATGEN/Makefile
index 49bc645f..34a6ff07 100644
--- a/TESTING/MATGEN/Makefile
+++ b/TESTING/MATGEN/Makefile
@@ -53,9 +53,9 @@ ZMATGEN = zlatms.o zlatme.o zlatmr.o zlatmt.o \
    zlagge.o zlaghe.o zlagsy.o zlakf2.o zlarge.o zlaror.o zlarot.o \
    zlatm1.o zlarnd.o zlatm2.o zlatm3.o zlatm5.o zlatm6.o zlahilb.o
 
-all:	../../$(TMGLIB)
+all: ../../$(TMGLIB)
 
-ALLOBJ = $(SMATGEN) $(CMATGEN) $(SCATGEN) $(DMATGEN) $(ZMATGEN)	\
+ALLOBJ = $(SMATGEN) $(CMATGEN) $(SCATGEN) $(DMATGEN) $(ZMATGEN) \
 	$(DZATGEN)
 
 ../../$(TMGLIB): $(ALLOBJ)
@@ -92,7 +92,7 @@ clean:
 	rm -f *.o
 
 .f.o:
-	$(FORTRAN) $(OPTS) -c $< -o $@
+	$(FORTRAN) $(OPTS) -c -o $@ $<
 
-slaran.o: slaran.f ; $(FORTRAN) $(NOOPT) -c $<
-dlaran.o: dlaran.f ; $(FORTRAN) $(NOOPT) -c $<
+slaran.o: slaran.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
+dlaran.o: dlaran.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
diff --git a/TESTING/Makefile b/TESTING/Makefile
index 92c89fe3..dfb5fc17 100644
--- a/TESTING/Makefile
+++ b/TESTING/Makefile
@@ -38,11 +38,11 @@
 include ../make.inc
 
 ifneq ($(strip $(VARLIB)),)
-    LAPACKLIB :=  $(VARLIB) ../$(LAPACKLIB)
+    LAPACKLIB := $(VARLIB) ../$(LAPACKLIB)
 endif
 
 
-all:     single complex double complex16 singleproto doubleproto complexproto complex16proto
+all: single complex double complex16 singleproto doubleproto complexproto complex16proto
 
 SEIGTST= snep.out \
          ssep.out \
@@ -53,7 +53,7 @@ SEIGTST= snep.out \
          sgg.out \
          sgd.out \
          ssb.out \
-	 ssg.out \
+         ssg.out \
          sbal.out \
          sbak.out \
          sgbal.out \
@@ -74,7 +74,7 @@ CEIGTST= cnep.out \
          cgg.out \
          cgd.out \
          csb.out \
-	 csg.out \
+         csg.out \
          cbal.out \
          cbak.out \
          cgbal.out \
@@ -95,7 +95,7 @@ DEIGTST= dnep.out \
          dgg.out \
          dgd.out \
          dsb.out \
-	 dsg.out \
+         dsg.out \
          dbal.out \
          dbak.out \
          dgbal.out \
@@ -116,7 +116,7 @@ ZEIGTST= znep.out \
          zgg.out \
          zgd.out \
          zsb.out \
-	 zsg.out \
+         zsg.out \
          zbal.out \
          zbak.out \
          zgbal.out \
@@ -276,7 +276,7 @@ sgbak.out: sgbak.in xeigtsts
 	./xeigtsts < sgbak.in > $@ 2>&1
 
 sbb.out: sbb.in xeigtsts
-	@echo SBB:  Testing banded Singular Value Decomposition routines
+	@echo SBB: Testing banded Singular Value Decomposition routines
 	./xeigtsts < sbb.in > $@ 2>&1
 
 sglm.out: glm.in xeigtsts
@@ -358,7 +358,7 @@ cgbak.out: cgbak.in xeigtstc
 	./xeigtstc < cgbak.in > $@ 2>&1
 
 cbb.out: cbb.in xeigtstc
-	@echo CBB:  Testing banded Singular Value Decomposition routines
+	@echo CBB: Testing banded Singular Value Decomposition routines
 	./xeigtstc < cbb.in > $@ 2>&1
 
 cglm.out: glm.in xeigtstc
@@ -428,7 +428,7 @@ dbal.out: dbal.in xeigtstd
 	./xeigtstd < dbal.in > $@ 2>&1
 
 dbak.out: dbak.in xeigtstd
-	@echo DGEBAK:  Testing the back transformation of a DOUBLE PRECISION balanced matrix
+	@echo DGEBAK: Testing the back transformation of a DOUBLE PRECISION balanced matrix
 	./xeigtstd < dbak.in > $@ 2>&1
 
 dgbal.out: dgbal.in xeigtstd
@@ -440,7 +440,7 @@ dgbak.out: dgbak.in xeigtstd
 	./xeigtstd < dgbak.in > $@ 2>&1
 
 dbb.out: dbb.in xeigtstd
-	@echo DBB:  Testing banded Singular Value Decomposition routines
+	@echo DBB: Testing banded Singular Value Decomposition routines
 	./xeigtstd < dbb.in > $@ 2>&1
 
 dglm.out: glm.in xeigtstd
@@ -546,46 +546,46 @@ zlse.out: lse.in xeigtstz
 	./xeigtstz < lse.in > $@ 2>&1
 # ==============================================================================
 
-xlintsts:	../$(LAPACKLIB) ../$(TMGLIB) $(FRCLIN) $(FRC)
+xlintsts: ../$(LAPACKLIB) ../$(TMGLIB) $(FRCLIN) $(FRC)
 	cd LIN ; $(MAKE) single
 
-xlintstc:	../$(LAPACKLIB) ../$(TMGLIB) $(FRCLIN) $(FRC)
+xlintstc: ../$(LAPACKLIB) ../$(TMGLIB) $(FRCLIN) $(FRC)
 	cd LIN ; $(MAKE) complex
 
-xlintstd:	../$(LAPACKLIB) ../$(TMGLIB) $(FRCLIN) $(FRC)
+xlintstd: ../$(LAPACKLIB) ../$(TMGLIB) $(FRCLIN) $(FRC)
 	cd LIN ; $(MAKE) double
 
-xlintstz:	../$(LAPACKLIB) ../$(TMGLIB) $(FRCLIN) $(FRC)
+xlintstz: ../$(LAPACKLIB) ../$(TMGLIB) $(FRCLIN) $(FRC)
 	cd LIN ; $(MAKE) complex16
 
-xlintstrfs:	../$(LAPACKLIB) ../$(TMGLIB) $(FRCLIN) $(FRC)
+xlintstrfs: ../$(LAPACKLIB) ../$(TMGLIB) $(FRCLIN) $(FRC)
 	cd LIN ; $(MAKE) proto-single
 
-xlintstrfc:	../$(LAPACKLIB) ../$(TMGLIB) $(FRCLIN) $(FRC)
+xlintstrfc: ../$(LAPACKLIB) ../$(TMGLIB) $(FRCLIN) $(FRC)
 	cd LIN ; $(MAKE) proto-complex
 
-xlintstrfd:	../$(LAPACKLIB) ../$(TMGLIB) $(FRCLIN) $(FRC)
+xlintstrfd: ../$(LAPACKLIB) ../$(TMGLIB) $(FRCLIN) $(FRC)
 	cd LIN ; $(MAKE) proto-double
 
-xlintstrfz:	../$(LAPACKLIB) ../$(TMGLIB) $(FRCLIN) $(FRC)
+xlintstrfz: ../$(LAPACKLIB) ../$(TMGLIB) $(FRCLIN) $(FRC)
 	cd LIN ; $(MAKE) proto-complex16
 
-xlintstds:	../$(LAPACKLIB) ../$(TMGLIB) $(FRCLIN) $(FRC)
+xlintstds: ../$(LAPACKLIB) ../$(TMGLIB) $(FRCLIN) $(FRC)
 	cd LIN ; $(MAKE) proto-double
 
-xlintstzc:	../$(LAPACKLIB) ../$(TMGLIB) $(FRCLIN) $(FRC)
+xlintstzc: ../$(LAPACKLIB) ../$(TMGLIB) $(FRCLIN) $(FRC)
 	cd LIN ; $(MAKE) proto-complex16
 
-xeigtsts:	../$(LAPACKLIB) ../$(TMGLIB) $(FRCEIG) $(FRC)
+xeigtsts: ../$(LAPACKLIB) ../$(TMGLIB) $(FRCEIG) $(FRC)
 	cd EIG ; $(MAKE) single
 
-xeigtstc:	../$(LAPACKLIB) ../$(TMGLIB) $(FRCEIG) $(FRC)
+xeigtstc: ../$(LAPACKLIB) ../$(TMGLIB) $(FRCEIG) $(FRC)
 	cd EIG ; $(MAKE) complex
 
-xeigtstd:	../$(LAPACKLIB) ../$(TMGLIB) $(FRCEIG) $(FRC)
+xeigtstd: ../$(LAPACKLIB) ../$(TMGLIB) $(FRCEIG) $(FRC)
 	cd EIG ; $(MAKE) double
 
-xeigtstz:	../$(LAPACKLIB) ../$(TMGLIB) $(FRCEIG) $(FRC)
+xeigtstz: ../$(LAPACKLIB) ../$(TMGLIB) $(FRCEIG) $(FRC)
 	cd EIG ; $(MAKE) complex16
 
 clean:
diff --git a/TESTING/ctest.in b/TESTING/ctest.in
index c5ed21fd..c5ed21fd 100755..100644
--- a/TESTING/ctest.in
+++ b/TESTING/ctest.in
diff --git a/TESTING/dtest.in b/TESTING/dtest.in
index d05a27ca..d05a27ca 100755..100644
--- a/TESTING/dtest.in
+++ b/TESTING/dtest.in
diff --git a/TESTING/stest.in b/TESTING/stest.in
index 30f1c470..30f1c470 100755..100644
--- a/TESTING/stest.in
+++ b/TESTING/stest.in
diff --git a/TESTING/ztest.in b/TESTING/ztest.in
index aba4a3d5..aba4a3d5 100755..100644
--- a/TESTING/ztest.in
+++ b/TESTING/ztest.in