Integrated linalg into Proc-SDK RTOS.

[dense-linear-algebra-libraries/linalg.git] / Makefile

diff --git a/Makefile b/Makefile
index b78f243acff5c338025c5a4574cf5b4827b805a6..a6c382ec98c4f23eb20581e7f912b9cfbac8b183 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,49 +15,29 @@ LINALG_HEADERS+=$(LINALG_CBLAS_DIR)/include/cblas.h
 
 ifeq ($(MEM_MODEL),Large)
 BLIS_CFG   = c66xLarge
-else ifeq ($(TARGET),Medium)
+else ifeq ($(MEM_MODEL),Medium)
 BLIS_CFG   = c66xMedium
-else ifeq ($(TARGET),Small)
+else ifeq ($(MEM_MODEL),Small)
 BLIS_CFG   = c66xSmall
 endif
 
-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_BLASACC_DIR)/src; make -f Makefile.ARM; \
-       cd ../../$(LINALG_CLAPACK_DIR); make f2clib; make cblaswrap; cd SRC; make 
-
-ARMplusDSP_K2H:
-       cd $(LINALG_CBLAS_DIR); make arch=ARM alllib; make arch=C66 alllib; \
-       cd ../$(LINALG_BLIS_DIR); ./configure -p install/c66xLarge c66x; make mem_model=Large -j8; make install; \
-       ./configure -p install/arm cortex-a15; make -j8; make install; \
-       cd ../$(LINALG_TICBLAS_DIR)/src; make mem_model=Large; cd ..; \
-       cd ../$(LINALG_BLASACC_DIR)/src; make mem_model=Large; cd..; \
-       cd ../$(LINALG_CLAPACK_DIR); make f2clib; make cblaswrap; cd SRC; make -j8
-
-ARMplusDSP_AM57x:
-       cd $(LINALG_CBLAS_DIR); make arch=ARM alllib; make arch=C66 alllib; \
-       cd ../$(LINALG_TICBLAS_DIR)/src; make MEM_MODEL=Small; cd ..; \
-       cd ../$(LINALG_BLIS_DIR); ./configure -p install/am57x am57x; make -j8; make install; \
-       ./configure -p install/arm cortex-a15; make -j8; make install; \
-       cd ../$(LINALG_BLASACC_DIR); make crossAM57x; \
-       cd ../$(LINALG_CLAPACK_DIR); make f2clib; make cblaswrap; cd SRC; make -j8
-
 DSPlibs:
        cd $(LINALG_CBLAS_DIR); make arch=C66 alllib; \
-       cd ../$(LINALG_BLIS_DIR); ./configure -p install/$(BLIS_CFG) c66x; make mem_model=$(MEM_MODEL) -j8; make install; \
-       cd ../$(LINALG_TICBLAS_DIR)/src; make mem_model=$(MEM_MODEL); cd ..; \
+       cd ../$(LINALG_BLIS_DIR); ./configure -p install/$(BLIS_CFG) c66x; make -j8 MEM_MODEL=$(MEM_MODEL) TARGET=$(TARGET) LIBOS=$(LIBOS); make install; \
+       cd ../$(LINALG_TICBLAS_DIR)/src; make MEM_MODEL=$(MEM_MODEL) TARGET=$(TARGET) LIBOS=$(LIBOS); cd ..;
 
 ARMplusDSP:
        cd $(LINALG_CBLAS_DIR); make arch=ARM alllib; \
        cd ../$(LINALG_BLIS_DIR); ./configure -p install/arm cortex-a15; make -j8; make install; \
-       cd ../$(LINALG_BLASACC_DIR)/src; make mem_model=Large; cd ..; \
+       cd ../$(LINALG_BLASACC_DIR)/src; make MEM_MODEL=$(MEM_MODEL) TARGET=$(TARGET); cd ..; \
        cd ../$(LINALG_CLAPACK_DIR); make f2clib; make cblaswrap; cd SRC; make -j8
 
+
+cleanDSPlibs:
+       cd $(LINALG_CBLAS_DIR); make clean; \
+       cd ../$(LINALG_BLIS_DIR); ./configure -p install/$(BLIS_CFG) c66x; make -j8 clean; \
+       cd ../$(LINALG_TICBLAS_DIR)/src; make clean; cd ..;
+
 #DSPonly:
        
 BLIStest:
@@ -72,10 +52,10 @@ CLAPACKtest:
        cd $(LINALG_CLAPACK_DIR)/TESTING/EIG; make
 
 
-cleanARMplusDSP_K2H:
+cleanARMplusDSP:
        cd $(LINALG_CBLAS_DIR); make arch=ARM clean; make arch=C66 clean; \
        cd ../$(LINALG_TICBLAS_DIR)/src; make clean; cd ..; \
-       cd ../$(LINALG_BLIS_DIR); ./configure -p install/c66x c66x; make clean; \
+       cd ../$(LINALG_BLIS_DIR); ./configure -p install/Large c66x; make clean; \
        ./configure -p install/arm cortex-a15; make clean; \
        cd ../$(LINALG_BLASACC_DIR); make clean; \
        cd ../$(LINALG_BLIS_DIR)/testsuite; make clean; \