summaryrefslogtreecommitdiff
path: root/BLAS/SRC
diff options
context:
space:
mode:
authorJulie <julie@cs.utk.edu>2016-11-25 17:03:05 -0800
committerJulie <julie@cs.utk.edu>2016-11-25 17:03:13 -0800
commit3f23bd5d53b33149118886201b01042edab3b5dc (patch)
tree5597b8119536d6bbcb066831d7b6ad34926c99b3 /BLAS/SRC
parent6661906c90105eec543cce45d484255f68e23d8e (diff)
downloadlapack-3f23bd5d53b33149118886201b01042edab3b5dc.tar.gz
lapack-3f23bd5d53b33149118886201b01042edab3b5dc.tar.bz2
lapack-3f23bd5d53b33149118886201b01042edab3b5dc.zip
merging: Various cleanups to makefiles #84
Contribution by @turboencabulator Closing #84
Diffstat (limited to 'BLAS/SRC')
-rw-r--r--BLAS/SRC/CMakeLists.txt10
-rw-r--r--BLAS/SRC/Makefile8
2 files changed, 9 insertions, 9 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 $@ $<