|
 |
b3c4c8 |
diff --git a/Makefile b/Makefile
|
|
|
b3c4c8 |
index 555d1c46..7dc74273 100644
|
|
|
b3c4c8 |
--- a/Makefile
|
|
|
b3c4c8 |
+++ b/Makefile
|
|
|
b3c4c8 |
@@ -144,13 +144,13 @@ tests :
|
|
|
b3c4c8 |
ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
|
|
|
b3c4c8 |
touch $(LIBNAME)
|
|
|
b3c4c8 |
ifndef NO_FBLAS
|
|
|
b3c4c8 |
- $(MAKE) -C test all
|
|
|
b3c4c8 |
+ $(MAKE) -C test FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all
|
|
|
b3c4c8 |
endif
|
|
|
b3c4c8 |
- $(MAKE) -C utest all
|
|
|
b3c4c8 |
+ $(MAKE) -C utest FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all
|
|
|
b3c4c8 |
ifneq ($(NO_CBLAS), 1)
|
|
|
b3c4c8 |
- $(MAKE) -C ctest all
|
|
|
b3c4c8 |
+ $(MAKE) -C ctest FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all
|
|
|
b3c4c8 |
ifeq ($(CPP_THREAD_SAFETY_TEST), 1)
|
|
|
b3c4c8 |
- $(MAKE) -C cpp_thread_test all
|
|
|
b3c4c8 |
+ $(MAKE) -C cpp_thread_test FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all
|
|
|
b3c4c8 |
endif
|
|
|
b3c4c8 |
endif
|
|
|
b3c4c8 |
endif
|
|
|
b3c4c8 |
diff --git a/cpp_thread_test/Makefile b/cpp_thread_test/Makefile
|
|
|
b3c4c8 |
index 81e3470e..d541b70d 100644
|
|
|
b3c4c8 |
--- a/cpp_thread_test/Makefile
|
|
|
b3c4c8 |
+++ b/cpp_thread_test/Makefile
|
|
|
b3c4c8 |
@@ -1,13 +1,14 @@
|
|
|
b3c4c8 |
-include ../Makefile.rule
|
|
|
b3c4c8 |
+TOPDIR = ..
|
|
|
b3c4c8 |
+include $(TOPDIR)/Makefile.system
|
|
|
b3c4c8 |
|
|
|
b3c4c8 |
all :: dgemv_tester dgemm_tester
|
|
|
b3c4c8 |
|
|
|
b3c4c8 |
dgemv_tester :
|
|
|
b3c4c8 |
- $(CXX) $(COMMON_OPT) -Wall -Wextra -Wshadow -fopenmp -std=c++11 dgemv_thread_safety.cpp ../libopenblas.a -lpthread -o dgemv_tester
|
|
|
b3c4c8 |
+ $(CXX) $(COMMON_OPT) -Wall -Wextra -Wshadow -fopenmp -std=c++11 dgemv_thread_safety.cpp ../$(LIBNAME) -lpthread -o dgemv_tester
|
|
|
b3c4c8 |
./dgemv_tester
|
|
|
b3c4c8 |
|
|
|
b3c4c8 |
dgemm_tester : dgemv_tester
|
|
|
b3c4c8 |
- $(CXX) $(COMMON_OPT) -Wall -Wextra -Wshadow -fopenmp -std=c++11 dgemm_thread_safety.cpp ../libopenblas.a -lpthread -o dgemm_tester
|
|
|
b3c4c8 |
+ $(CXX) $(COMMON_OPT) -Wall -Wextra -Wshadow -fopenmp -std=c++11 dgemm_thread_safety.cpp ../$(LIBNAME) -lpthread -o dgemm_tester
|
|
|
b3c4c8 |
./dgemm_tester
|
|
|
b3c4c8 |
|
|
|
b3c4c8 |
clean ::
|