merging: Various cleanups to makefiles #84

Contribution by @turboencabulator
Closing #84

11 files changed, 136 insertions, 194 deletions

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 $@ $<