From 0833183162a47876a8f24532264da51010d80623 Mon Sep 17 00:00:00 2001 From: Jianzhong Xu Date: Wed, 8 Jun 2016 15:08:41 -0400 Subject: [PATCH] Removed 'mmv' from Makefile. --- src/ti/linalg/Makefile | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/ti/linalg/Makefile b/src/ti/linalg/Makefile index e15749f..409128a 100644 --- a/src/ti/linalg/Makefile +++ b/src/ti/linalg/Makefile @@ -55,10 +55,10 @@ DSPlibs: make -j8 MEM_MODEL=$(MEM_MODEL) TARGET=$(TARGET) LIBOS=$(LIBOS) NUM_DSP_CORES=$(NUM_DSP_CORES); make install; \ cd ../$(LINALG_TICBLAS_DIR)/src; make MEM_MODEL=$(MEM_MODEL) TARGET=$(TARGET) LIBOS=$(LIBOS) NUM_DSP_CORES=$(NUM_DSP_CORES); cd ../lib; \ echo "combining BLIS, CBLAS, and TICBLAS libraries into one: libcblas.ae66"; \ - mkdir -p objs; cd objs; rm -f *; ar x ../../../blis/install/$(BLIS_CFG)/lib/libblis.ae66; mmv 'cblas*.o' 'blis_cblas#1.o'; \ - ar -x ../../../cblas/lib/C66/libcblas.ae66; ar -x ../libticblas.ae66; chmod +rw *;cd ../../..; \ - mkdir -p lib; cd lib; rm -f *; ar -cr libcblas.ae66 ../ticblas/lib/objs/*; cd ..; \ - mkdir -p include; rm -f include/*; cp $(CBLAS_HEADERS) include + rm -rf blas_objs blis_objs; mkdir blas_objs blis_objs; cd blis_objs; ar x ../../../blis/install/$(BLIS_CFG)/lib/libblis.ae66; chmod +rw *; \ + cd ../blas_objs; ar -x ../../../cblas/lib/C66/libcblas.ae66; ar -x ../libticblas.ae66; chmod +rw *; cd ../../..; \ + rm -rf lib; mkdir lib; cd lib; ar -cr libcblas.ae66 ../ticblas/lib/blas_objs/*; ar -q libcblas.ae66 ../ticblas/lib/blis_objs/*; cd ..; \ + rm -rf include; mkdir include; cp $(CBLAS_HEADERS) include # Build ARM code for ARM+DSP platforms ARMlibs: @@ -78,11 +78,11 @@ ARMlibs: # - libf2c.a: F2C library used by CLAPACK ARMplusDSP: DSPlibs ARMlibs cd $(LINALG_BLASACC_DIR)/src; make MEM_MODEL=$(MEM_MODEL) TARGET=$(TARGET); cd ../..; \ - cd lib; rm -f *; \ - cp ../$(LINALG_BLASACC_DIR)/lib/libcblas_armplusdsp.a .; \ - cp ../$(LINALG_BLIS_DIR)/install/arm/lib/libblis.a .; \ - ar -x libblis.a; mmv "cblas_*.o" "blis_cblas_#1.o"; ar -x libcblas_armplusdsp.a; rm *.a; \ - ar -cr libcblas_armplusdsp.a *.o; rm *.o; cd ..; \ + cd lib; rm -rf *; mkdir blis_objs blas_acc_objs; \ + cp ../$(LINALG_BLASACC_DIR)/lib/libcblas_armplusdsp.a blas_acc_objs; \ + cp ../$(LINALG_BLIS_DIR)/install/arm/lib/libblis.a blis_objs; \ + cd blis_objs; ar -x libblis.a; cd ../blas_acc_objs; ar -x libcblas_armplusdsp.a; cd ../; \ + ar -cr libcblas_armplusdsp.a blas_acc_objs/*.o; ar -q libcblas_armplusdsp.a blis_objs/*.o; rm -r blas_acc_objs blis_objs; cd ..; \ cp $(LINALG_CLAPACK_DIR)/lapack_ARM.a ./lib/liblapack.a; \ cp $(LINALG_CLAPACK_DIR)/libcblaswr_ARM.a ./lib/libcblaswr.a; \ cp $(LINALG_CLAPACK_DIR)/F2CLIBS/libf2c_ARM.a ./lib/libf2c.a; \ @@ -139,4 +139,3 @@ installARMplusDSPlib: cp ./lib/libcblaswr.a ${DESTDIR}/lib cp ./lib/libf2c.a ${DESTDIR}/lib cp -r docs ${DESTDIR} - -- 2.39.2