Various whitespace cleanup

2 files changed, 76 insertions, 69 deletions

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..3ce26a54 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,13 +235,13 @@ 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: