Intermediate changes

1 files changed, 168 insertions, 165 deletions

diff --git a/contrib/libs/cblas/ya.make b/contrib/libs/cblas/ya.make
index bcda32a468..6532668849 100644
--- a/contrib/libs/cblas/ya.make
+++ b/contrib/libs/cblas/ya.make
@@ -22,7 +22,9 @@ ELSE()
     PEERDIR(
         ADDINCL contrib/libs/libf2c
     )
-    ADDINCLSELF()
+    ADDINCL(
+        contrib/libs/cblas/include
+    )
     SRCS(
         caxpy.c
         ccopy.c
@@ -175,170 +177,171 @@ ELSE()
         ztrmv.c
         ztrsm.c
         ztrsv.c
-        cblas_interface/cblas_caxpy.c
-        cblas_interface/cblas_ccopy.c
-        cblas_interface/cblas_cdotc_sub.c
-        cblas_interface/cblas_cdotu_sub.c
-        cblas_interface/cblas_cgbmv.c
-        cblas_interface/cblas_cgemm.c
-        cblas_interface/cblas_cgemv.c
-        cblas_interface/cblas_cgerc.c
-        cblas_interface/cblas_cgeru.c
-        cblas_interface/cblas_chbmv.c
-        cblas_interface/cblas_chemm.c
-        cblas_interface/cblas_chemv.c
-        cblas_interface/cblas_cher.c
-        cblas_interface/cblas_cher2.c
-        cblas_interface/cblas_cher2k.c
-        cblas_interface/cblas_cherk.c
-        cblas_interface/cblas_chpmv.c
-        cblas_interface/cblas_chpr.c
-        cblas_interface/cblas_chpr2.c
-        cblas_interface/cblas_cscal.c
-        cblas_interface/cblas_csscal.c
-        cblas_interface/cblas_cswap.c
-        cblas_interface/cblas_csymm.c
-        cblas_interface/cblas_csyr2k.c
-        cblas_interface/cblas_csyrk.c
-        cblas_interface/cblas_ctbmv.c
-        cblas_interface/cblas_ctbsv.c
-        cblas_interface/cblas_ctpmv.c
-        cblas_interface/cblas_ctpsv.c
-        cblas_interface/cblas_ctrmm.c
-        cblas_interface/cblas_ctrmv.c
-        cblas_interface/cblas_ctrsm.c
-        cblas_interface/cblas_ctrsv.c
-        cblas_interface/cblas_dasum.c
-        cblas_interface/cblas_daxpy.c
-        cblas_interface/cblas_dcopy.c
-        cblas_interface/cblas_ddot.c
-        cblas_interface/cblas_dgbmv.c
-        cblas_interface/cblas_dgemm.c
-        cblas_interface/cblas_dgemv.c
-        cblas_interface/cblas_dger.c
-        cblas_interface/cblas_dnrm2.c
-        cblas_interface/cblas_drot.c
-        cblas_interface/cblas_drotg.c
-        cblas_interface/cblas_drotm.c
-        cblas_interface/cblas_drotmg.c
-        cblas_interface/cblas_dsbmv.c
-        cblas_interface/cblas_dscal.c
-        cblas_interface/cblas_dsdot.c
-        cblas_interface/cblas_dspmv.c
-        cblas_interface/cblas_dspr.c
-        cblas_interface/cblas_dspr2.c
-        cblas_interface/cblas_dswap.c
-        cblas_interface/cblas_dsymm.c
-        cblas_interface/cblas_dsymv.c
-        cblas_interface/cblas_dsyr.c
-        cblas_interface/cblas_dsyr2.c
-        cblas_interface/cblas_dsyr2k.c
-        cblas_interface/cblas_dsyrk.c
-        cblas_interface/cblas_dtbmv.c
-        cblas_interface/cblas_dtbsv.c
-        cblas_interface/cblas_dtpmv.c
-        cblas_interface/cblas_dtpsv.c
-        cblas_interface/cblas_dtrmm.c
-        cblas_interface/cblas_dtrmv.c
-        cblas_interface/cblas_dtrsm.c
-        cblas_interface/cblas_dtrsv.c
-        cblas_interface/cblas_dzasum.c
-        cblas_interface/cblas_dznrm2.c
-        cblas_interface/cblas_globals.c
-        cblas_interface/cblas_icamax.c
-        cblas_interface/cblas_idamax.c
-        cblas_interface/cblas_isamax.c
-        cblas_interface/cblas_izamax.c
-        cblas_interface/cblas_sasum.c
-        cblas_interface/cblas_saxpy.c
-        cblas_interface/cblas_scasum.c
-        cblas_interface/cblas_scnrm2.c
-        cblas_interface/cblas_scopy.c
-        cblas_interface/cblas_sdot.c
-        cblas_interface/cblas_sdsdot.c
-        cblas_interface/cblas_sgbmv.c
-        cblas_interface/cblas_sgemm.c
-        cblas_interface/cblas_sgemv.c
-        cblas_interface/cblas_sger.c
-        cblas_interface/cblas_snrm2.c
-        cblas_interface/cblas_srot.c
-        cblas_interface/cblas_srotg.c
-        cblas_interface/cblas_srotm.c
-        cblas_interface/cblas_srotmg.c
-        cblas_interface/cblas_ssbmv.c
-        cblas_interface/cblas_sscal.c
-        cblas_interface/cblas_sspmv.c
-        cblas_interface/cblas_sspr.c
-        cblas_interface/cblas_sspr2.c
-        cblas_interface/cblas_sswap.c
-        cblas_interface/cblas_ssymm.c
-        cblas_interface/cblas_ssymv.c
-        cblas_interface/cblas_ssyr.c
-        cblas_interface/cblas_ssyr2.c
-        cblas_interface/cblas_ssyr2k.c
-        cblas_interface/cblas_ssyrk.c
-        cblas_interface/cblas_stbmv.c
-        cblas_interface/cblas_stbsv.c
-        cblas_interface/cblas_stpmv.c
-        cblas_interface/cblas_stpsv.c
-        cblas_interface/cblas_strmm.c
-        cblas_interface/cblas_strmv.c
-        cblas_interface/cblas_strsm.c
-        cblas_interface/cblas_strsv.c
-        cblas_interface/cblas_xerbla.c
-        cblas_interface/cblas_zaxpy.c
-        cblas_interface/cblas_zcopy.c
-        cblas_interface/cblas_zdotc_sub.c
-        cblas_interface/cblas_zdotu_sub.c
-        cblas_interface/cblas_zdscal.c
-        cblas_interface/cblas_zgbmv.c
-        cblas_interface/cblas_zgemm.c
-        cblas_interface/cblas_zgemv.c
-        cblas_interface/cblas_zgerc.c
-        cblas_interface/cblas_zgeru.c
-        cblas_interface/cblas_zhbmv.c
-        cblas_interface/cblas_zhemm.c
-        cblas_interface/cblas_zhemv.c
-        cblas_interface/cblas_zher.c
-        cblas_interface/cblas_zher2.c
-        cblas_interface/cblas_zher2k.c
-        cblas_interface/cblas_zherk.c
-        cblas_interface/cblas_zhpmv.c
-        cblas_interface/cblas_zhpr.c
-        cblas_interface/cblas_zhpr2.c
-        cblas_interface/cblas_zscal.c
-        cblas_interface/cblas_zswap.c
-        cblas_interface/cblas_zsymm.c
-        cblas_interface/cblas_zsyr2k.c
-        cblas_interface/cblas_zsyrk.c
-        cblas_interface/cblas_ztbmv.c
-        cblas_interface/cblas_ztbsv.c
-        cblas_interface/cblas_ztpmv.c
-        cblas_interface/cblas_ztpsv.c
-        cblas_interface/cblas_ztrmm.c
-        cblas_interface/cblas_ztrmv.c
-        cblas_interface/cblas_ztrsm.c
-        cblas_interface/cblas_ztrsv.c
-        cblas_interface/cdotcsub.c
-        cblas_interface/cdotusub.c
-        cblas_interface/dasumsub.c
-        cblas_interface/ddotsub.c
-        cblas_interface/dnrm2sub.c
-        cblas_interface/dsdotsub.c
-        cblas_interface/dzasumsub.c
-        cblas_interface/dznrm2sub.c
-        cblas_interface/icamaxsub.c
-        cblas_interface/idamaxsub.c
-        cblas_interface/isamaxsub.c
-        cblas_interface/izamaxsub.c
-        cblas_interface/sasumsub.c
-        cblas_interface/scasumsub.c
-        cblas_interface/scnrm2sub.c
-        cblas_interface/sdotsub.c
-        cblas_interface/sdsdotsub.c
-        cblas_interface/snrm2sub.c
-        cblas_interface/zdotcsub.c
-        cblas_interface/zdotusub.c
+        src/cblas_caxpy.c
+        src/cblas_ccopy.c
+        src/cblas_cdotc_sub.c
+        src/cblas_cdotu_sub.c
+        src/cblas_cgbmv.c
+        src/cblas_cgemm.c
+        src/cblas_cgemv.c
+        src/cblas_cgerc.c
+        src/cblas_cgeru.c
+        src/cblas_chbmv.c
+        src/cblas_chemm.c
+        src/cblas_chemv.c
+        src/cblas_cher.c
+        src/cblas_cher2.c
+        src/cblas_cher2k.c
+        src/cblas_cherk.c
+        src/cblas_chpmv.c
+        src/cblas_chpr.c
+        src/cblas_chpr2.c
+        src/cblas_cscal.c
+        src/cblas_csscal.c
+        src/cblas_cswap.c
+        src/cblas_csymm.c
+        src/cblas_csyr2k.c
+        src/cblas_csyrk.c
+        src/cblas_ctbmv.c
+        src/cblas_ctbsv.c
+        src/cblas_ctpmv.c
+        src/cblas_ctpsv.c
+        src/cblas_ctrmm.c
+        src/cblas_ctrmv.c
+        src/cblas_ctrsm.c
+        src/cblas_ctrsv.c
+        src/cblas_dasum.c
+        src/cblas_daxpy.c
+        src/cblas_dcopy.c
+        src/cblas_ddot.c
+        src/cblas_dgbmv.c
+        src/cblas_dgemm.c
+        src/cblas_dgemv.c
+        src/cblas_dger.c
+        src/cblas_dnrm2.c
+        src/cblas_drot.c
+        src/cblas_drotg.c
+        src/cblas_drotm.c
+        src/cblas_drotmg.c
+        src/cblas_dsbmv.c
+        src/cblas_dscal.c
+        src/cblas_dsdot.c
+        src/cblas_dspmv.c
+        src/cblas_dspr.c
+        src/cblas_dspr2.c
+        src/cblas_dswap.c
+        src/cblas_dsymm.c
+        src/cblas_dsymv.c
+        src/cblas_dsyr.c
+        src/cblas_dsyr2.c
+        src/cblas_dsyr2k.c
+        src/cblas_dsyrk.c
+        src/cblas_dtbmv.c
+        src/cblas_dtbsv.c
+        src/cblas_dtpmv.c
+        src/cblas_dtpsv.c
+        src/cblas_dtrmm.c
+        src/cblas_dtrmv.c
+        src/cblas_dtrsm.c
+        src/cblas_dtrsv.c
+        src/cblas_dzasum.c
+        src/cblas_dznrm2.c
+        src/cblas_globals.c
+        src/cblas_icamax.c
+        src/cblas_idamax.c
+        src/cblas_isamax.c
+        src/cblas_izamax.c
+        src/cblas_sasum.c
+        src/cblas_saxpy.c
+        src/cblas_scasum.c
+        src/cblas_scnrm2.c
+        src/cblas_scopy.c
+        src/cblas_sdot.c
+        src/cblas_sdsdot.c
+        src/cblas_sgbmv.c
+        src/cblas_sgemm.c
+        src/cblas_sgemv.c
+        src/cblas_sger.c
+        src/cblas_snrm2.c
+        src/cblas_srot.c
+        src/cblas_srotg.c
+        src/cblas_srotm.c
+        src/cblas_srotmg.c
+        src/cblas_ssbmv.c
+        src/cblas_sscal.c
+        src/cblas_sspmv.c
+        src/cblas_sspr.c
+        src/cblas_sspr2.c
+        src/cblas_sswap.c
+        src/cblas_ssymm.c
+        src/cblas_ssymv.c
+        src/cblas_ssyr.c
+        src/cblas_ssyr2.c
+        src/cblas_ssyr2k.c
+        src/cblas_ssyrk.c
+        src/cblas_stbmv.c
+        src/cblas_stbsv.c
+        src/cblas_stpmv.c
+        src/cblas_stpsv.c
+        src/cblas_strmm.c
+        src/cblas_strmv.c
+        src/cblas_strsm.c
+        src/cblas_strsv.c
+        src/cblas_xerbla.c
+        src/cblas_zaxpy.c
+        src/cblas_zcopy.c
+        src/cblas_zdotc_sub.c
+        src/cblas_zdotu_sub.c
+        src/cblas_zdscal.c
+        src/cblas_zgbmv.c
+        src/cblas_zgemm.c
+        src/cblas_zgemv.c
+        src/cblas_zgerc.c
+        src/cblas_zgeru.c
+        src/cblas_zhbmv.c
+        src/cblas_zhemm.c
+        src/cblas_zhemv.c
+        src/cblas_zher.c
+        src/cblas_zher2.c
+        src/cblas_zher2k.c
+        src/cblas_zherk.c
+        src/cblas_zhpmv.c
+        src/cblas_zhpr.c
+        src/cblas_zhpr2.c
+        src/cblas_zscal.c
+        src/cblas_zswap.c
+        src/cblas_zsymm.c
+        src/cblas_zsyr2k.c
+        src/cblas_zsyrk.c
+        src/cblas_ztbmv.c
+        src/cblas_ztbsv.c
+        src/cblas_ztpmv.c
+        src/cblas_ztpsv.c
+        src/cblas_ztrmm.c
+        src/cblas_ztrmv.c
+        src/cblas_ztrsm.c
+        src/cblas_ztrsv.c
+        src/cdotcsub.c
+        src/cdotusub.c
+        src/dasumsub.c
+        src/ddotsub.c
+        src/dnrm2sub.c
+        src/dsdotsub.c
+        src/dzasumsub.c
+        src/dznrm2sub.c
+        src/icamaxsub.c
+        src/idamaxsub.c
+        src/isamaxsub.c
+        src/izamaxsub.c
+        src/sasumsub.c
+        src/scasumsub.c
+        src/scnrm2sub.c
+        src/sdotsub.c
+        src/sdsdotsub.c
+        src/snrm2sub.c
+        src/xerbla.c
+        src/zdotcsub.c
+        src/zdotusub.c
     )
 ENDIF()