merging: Various cleanups to makefiles #84

Contribution by @turboencabulator
Closing #84

13 files changed, 173 insertions, 362 deletions

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