X-Git-Url: https://git.ti.com/gitweb?p=dense-linear-algebra-libraries%2Flinalg.git;a=blobdiff_plain;f=Makefile;h=583405280b5b53a4ffa656285a4cec0bddeb105c;hp=a14088839ce2551a8616408ecaf614353e0a6a49;hb=ca7c32e60ba9c21101827ed50169575f9a514c59;hpb=ecfbc169e014dc6945df0a4a54c2c35537335632

diff --git a/Makefile b/Makefile
index a140888..5834052 100644
--- a/Makefile
+++ b/Makefile
@@ -1,45 +1,49 @@
 
-DESTDIR = "/evmk2h_nfs"
-
-.PHONY: clean ARMonly linalg install build prebuild
+.PHONY: clean ARMonly linalg cleanall install build prebuild
 
 LINALG_BLIS_DIR     = blis
 LINALG_CBLAS_DIR    = cblas
 LINALG_BLISACC_DIR  = blasblisacc
+BLIS_VERSION = $(shell cat $(LINALG_BLIS_DIR)/version)
 
-prebuild: DSPonly
 build: ARMonly
+prebuild: DSPonly
 linalg: ARMplusDSP
 
+ARMonly: 
+	cd $(LINALG_CBLAS_DIR); make arch=ARM alllib; \
+	cd ../$(LINALG_BLIS_DIR); ./configure -p install/arm cortex-a15; make -j8; make install; \
+	cd ../$(LINALG_BLISACC_DIR)/src; make -f Makefile.ARM
+
 ARMplusDSP:
 	cd $(LINALG_CBLAS_DIR); make arch=ARM alllib; make arch=C66 alllib; \
 	cd ../$(LINALG_BLIS_DIR); ./configure -p install/c66x c66x; make -j8; make install; \
 	./configure -p install/arm cortex-a15; make -j8; make install; \
-	cd ../$(LINALG_BLISACC_DIR); make cross; \
-	cd ../$(LINALG_BLIS_DIR)/testsuite; make lib=OpenCLCBLAS -j8
-
-DSPonly:
-	cd $(LINALG_CBLAS_DIR); make arch=C66 alllib; \
-	cd ../$(LINALG_BLIS_DIR); ./configure -p install/c66x c66x; make -j8; make install
-	
-ARMonly: 
-	cd $(LINALG_CBLAS_DIR); make arch=ARM alllib; \
-	cd ../$(LINALG_BLIS_DIR); ./configure -p install/arm cortex-a15; make -j8; make install; \
-	cd ../$(LINALG_BLISACC_DIR); make cross; \
+	cd ../$(LINALG_BLISACC_DIR); make cross; 
 	cd ../$(LINALG_BLIS_DIR)/testsuite; make lib=OpenCLCBLAS -j8
 
-clean:
+cleanall:
 	cd $(LINALG_CBLAS_DIR); make arch=ARM clean; make arch=C66 clean; \
 	cd ../$(LINALG_BLIS_DIR); ./configure -p install/c66x c66x; make clean; \
 	./configure -p install/arm cortex-a15; make clean; \
 	cd ../$(LINALG_BLISACC_DIR); make clean; \
 	cd ../$(LINALG_BLIS_DIR)/testsuite; make clean
 
+DSPonly:
+	cd $(LINALG_CBLAS_DIR); make arch=C66 alllib; \
+	cd ../$(LINALG_BLIS_DIR); ./configure -p install/c66x c66x; make -j8; make install; \
+	cd ../$(LINALG_BLISACC_DIR)/src; make ti_cblas_kernel.dsp_h
+	
+clean:
+	cd $(LINALG_CBLAS_DIR)/src; make arch=ARM clean; \
+	cd ../../$(LINALG_BLIS_DIR); ./configure -p install/arm cortex-a15; make clean; \
+	cd ../$(LINALG_BLISACC_DIR); make clean
+
 install:
 	install -m 755 -d ${DESTDIR}/usr/include
 	install -m 755 -d ${DESTDIR}/usr/lib
-	install -m 755 -d ${DESTDIR}/usr/share/ti/examples/linalg
+	install -m 755 -d ${DESTDIR}/usr/share/ti/examples/linalg	
 	cp $(LINALG_CBLAS_DIR)/include/cblas.h ${DESTDIR}/usr/include
 	cp $(LINALG_BLISACC_DIR)/lib/libcblas_armplusdsp.a ${DESTDIR}/usr/lib
-	cp $(LINALG_BLIS_DIR)/install/arm/lib/libblis-*-cortex-a15.a ${DESTDIR}/usr/lib/libblis.a
+	cp $(LINALG_BLIS_DIR)/install/arm/lib/libblis-$(BLIS_VERSION)-cortex-a15.a ${DESTDIR}/usr/lib/libblis.a
 	cp -r ./examples/* ${DESTDIR}/usr/share/ti/examples/linalg