Merge pull request #19 from ecrc/egonzalf/fix-makefile

Egonzalf/fix makefile
ecrc · Nov 7, 2017 · 86032bf · 86032bf
2 parents 77f808a + 0769b54
commit 86032bf
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -1,8 +1,10 @@
+.PHONY: all clean
+
 all:
 	(cd src && make -j)
 	(cd testing && make -j)
 
 clean:
 	rm -f -v ./lib/*.a
 	(cd src && make clean)
-	(cd testing && make clean)
+	(cd testing && make clean)
diff --git a/testing/Makefile b/testing/Makefile
@@ -40,12 +40,9 @@ include $(KBLAS_TEST3_DIR)/Makefile
 C_OBJ= $(patsubst %.c,$(OBJ_DIR)/%.o,$(C_SRC))
 EXE= $(patsubst %.c,$(BIN_DIR)/%,$(C_SRC))
 
-$(BIN_DIR)/test_%: $(OBJ_DIR)/test_%.o
-	$(CC) $(COPTS) $< -o $@ $(LIB_PATH) $(LIB)
-
 all: $(EXE)
 
-$(EXE): $(C_OBJ)
-
+$(EXE): $(BIN_DIR)/%: $(OBJ_DIR)/%.o $(KBLAS_LIB)
+	$(CC) $(COPTS) $< -o $@ $(LIB_PATH) $(LIB)
 clean:
 	rm -f $(OBJ_DIR)/*.o $(EXE)
diff --git a/testing/blas_l2/Makefile b/testing/blas_l2/Makefile
@@ -45,5 +45,5 @@ C_SRC+=	test_sscal.c \
 	test_dgemv2_dim.c
 
 
-$(OBJ_DIR)/test_%.o: $(KBLAS_TEST2_DIR)/test_%.c $(INC_SRC) $(KBLAS_LIB)
+$(OBJ_DIR)/test_%.o: $(KBLAS_TEST2_DIR)/test_%.c $(INC_SRC)
 	$(CC) $(COPTS) $(INCLUDES) -c $< -o $@
diff --git a/testing/blas_l3/Makefile b/testing/blas_l3/Makefile
@@ -35,27 +35,27 @@ C_SRC+=	              \
 # EXE+= $(patsubst %.c,$(BIN_DIR)/%,$(KBLAS_L3_CSRC))
 
 
-$(OBJ_DIR)/test_%trmm.o: $(KBLAS_TEST3_DIR)/test_%trmm.c $(KBLAS_TEST3_DIR)/test_trmm.ch testing_Xtr_common.h $(INC_SRC) $(KBLAS_LIB)
+$(OBJ_DIR)/test_%trmm.o: $(KBLAS_TEST3_DIR)/test_%trmm.c $(KBLAS_TEST3_DIR)/test_trmm.ch testing_Xtr_common.h $(INC_SRC)
 	$(CXX) $(INCLUDES) -c $< -o $@
 
-$(OBJ_DIR)/test_%trmm_cpu.o: $(KBLAS_TEST3_DIR)/test_%trmm_cpu.c $(KBLAS_TEST3_DIR)/test_trmm_cpu.ch testing_Xtr_common.h $(INC_SRC) $(KBLAS_LIB)
+$(OBJ_DIR)/test_%trmm_cpu.o: $(KBLAS_TEST3_DIR)/test_%trmm_cpu.c $(KBLAS_TEST3_DIR)/test_trmm_cpu.ch testing_Xtr_common.h $(INC_SRC)
 	$(CXX) $(INCLUDES) -c $< -o $@
 
-$(OBJ_DIR)/test_%trmm_mgpu.o: $(KBLAS_TEST3_DIR)/test_%trmm_mgpu.c $(KBLAS_TEST3_DIR)/test_trmm_mgpu.ch testing_Xtr_common.h $(INC_SRC) $(KBLAS_LIB)
+$(OBJ_DIR)/test_%trmm_mgpu.o: $(KBLAS_TEST3_DIR)/test_%trmm_mgpu.c $(KBLAS_TEST3_DIR)/test_trmm_mgpu.ch testing_Xtr_common.h $(INC_SRC)
 	$(CXX) $(INCLUDES) -c $< -o $@
 
-$(OBJ_DIR)/test_%trsm.o: $(KBLAS_TEST3_DIR)/test_%trsm.c $(KBLAS_TEST3_DIR)/test_trsm.ch testing_Xtr_common.h $(INC_SRC) $(KBLAS_LIB)
+$(OBJ_DIR)/test_%trsm.o: $(KBLAS_TEST3_DIR)/test_%trsm.c $(KBLAS_TEST3_DIR)/test_trsm.ch testing_Xtr_common.h $(INC_SRC)
 	$(CXX) $(INCLUDES) -c $< -o $@
 
-$(OBJ_DIR)/test_%trsm_cpu.o: $(KBLAS_TEST3_DIR)/test_%trsm_cpu.c $(KBLAS_TEST3_DIR)/test_trsm_cpu.ch testing_Xtr_common.h $(INC_SRC) $(KBLAS_LIB)
+$(OBJ_DIR)/test_%trsm_cpu.o: $(KBLAS_TEST3_DIR)/test_%trsm_cpu.c $(KBLAS_TEST3_DIR)/test_trsm_cpu.ch testing_Xtr_common.h $(INC_SRC)
 	$(CXX) $(INCLUDES) -c $< -o $@
 
-$(OBJ_DIR)/test_%trsm_mgpu.o: $(KBLAS_TEST3_DIR)/test_%trsm_mgpu.c $(KBLAS_TEST3_DIR)/test_trsm_mgpu.ch testing_Xtr_common.h $(INC_SRC) $(KBLAS_LIB)
+$(OBJ_DIR)/test_%trsm_mgpu.o: $(KBLAS_TEST3_DIR)/test_%trsm_mgpu.c $(KBLAS_TEST3_DIR)/test_trsm_mgpu.ch testing_Xtr_common.h $(INC_SRC)
 	$(CXX) $(INCLUDES) -c $< -o $@
 
-$(OBJ_DIR)/test_%gemm.o: $(KBLAS_TEST3_DIR)/test_%gemm.c $(KBLAS_TEST3_DIR)/test_gemm.ch testing_Xtr_common.h $(INC_SRC) $(KBLAS_LIB)
+$(OBJ_DIR)/test_%gemm.o: $(KBLAS_TEST3_DIR)/test_%gemm.c $(KBLAS_TEST3_DIR)/test_gemm.ch testing_Xtr_common.h $(INC_SRC)
 	$(CXX) $(INCLUDES) -c $< -o $@
 
-$(OBJ_DIR)/test_%gemmXt.o: $(KBLAS_TEST3_DIR)/test_%gemmXt.c $(INC_SRC) $(KBLAS_LIB)
+$(OBJ_DIR)/test_%gemmXt.o: $(KBLAS_TEST3_DIR)/test_%gemmXt.c $(INC_SRC)
 	$(CXX) $(INCLUDES) -c $< -o $@