Merge current Makefile from develop

diff --git a/utest/Makefile b/utest/Makefile
index b33734c..03457b0 100644 (file)
--- a/utest/Makefile
+++ b/utest/Makefile
@@ -8,11 +8,19 @@ UTESTBIN=openblas_utest
 
 include $(TOPDIR)/Makefile.system
 
-OBJS=utest_main.o test_amax.o test_fork.o test_rotmg.o
-#test_rot.o test_swap.o test_axpy.o test_dotu.o test_rotmg.o test_dsdot.o test_fork.o
+OBJS=utest_main.o test_amax.o test_rotmg.o
+#test_rot.o test_swap.o test_axpy.o test_dotu.o test_dsdot.o test_fork.o
 
 ifneq ($(NO_LAPACK), 1)
-OBJS += test_potrs.o
+#OBJS += test_potrs.o
+endif
+
+ifndef OS_WINDOWS
+OBJS += test_fork.o
+else
+ifdef OS_CYGWIN_NT
+OBJS += test_fork.o
+endif
 endif
 
 all : run_test