Fixed #374.

Merge branch 'TimothyGu-develop' into develop

diff --combined Makefile
index 01bedaf,66d0947..2f5d032
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -129,6 -129,11 +129,11 @@@ endi
  ifeq ($(NOFORTRAN), 1)
        $(error OpenBLAS: Detecting fortran compiler failed. Please install fortran compiler, e.g. gfortran, ifort, openf90.)
  endif
+ ifeq ($(NO_STATIC), 1)
+ ifeq ($(NO_SHARED), 1)
+       $(error OpenBLAS: neither static nor shared are enabled.)
+ endif
+ endif
        @-ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
        @for d in $(SUBDIRS) ; \
        do if test -d $$d; then \
@@@ -207,7 -212,6 +212,7 @@@ els
  netlib : lapack_prebuild
  ifndef NOFORTRAN
        @$(MAKE) -C $(NETLIB_LAPACK_DIR) lapacklib
 +      @$(MAKE) -C $(NETLIB_LAPACK_DIR) tmglib
  endif
  ifndef NO_LAPACKE
        @$(MAKE) -C $(NETLIB_LAPACK_DIR) lapackelib
@@@ -231,18 -235,11 +236,18 @@@ ifndef NOFORTRA
        -@echo "ARCHFLAGS   = -ru" >> $(NETLIB_LAPACK_DIR)/make.inc
        -@echo "RANLIB      = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
        -@echo "LAPACKLIB   = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
 +      -@echo "TMGLIB      = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
 +      -@echo "BLASLIB     = ../../../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
        -@echo "LAPACKELIB  = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
        -@echo "LAPACKLIB_P = ../$(LIBNAME_P)" >> $(NETLIB_LAPACK_DIR)/make.inc
        -@echo "SUFFIX      = $(SUFFIX)" >> $(NETLIB_LAPACK_DIR)/make.inc
        -@echo "PSUFFIX     = $(PSUFFIX)" >> $(NETLIB_LAPACK_DIR)/make.inc
        -@echo "CEXTRALIB   = $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
 +ifeq ($(F_COMPILER), GFORTRAN)
 +      -@echo "TIMER       = INT_ETIME" >> $(NETLIB_LAPACK_DIR)/make.inc
 +else
 +      -@echo "TIMER       = NONE" >> $(NETLIB_LAPACK_DIR)/make.inc
 +endif
        -@cat  make.inc >> $(NETLIB_LAPACK_DIR)/make.inc
  endif
  
@@@ -264,12 -261,13 +269,12 @@@ lapack-timing : large.tgz timing.tg
  ifndef NOFORTRAN
        (cd $(NETLIB_LAPACK_DIR); $(TAR) zxf ../timing.tgz TIMING)
        (cd $(NETLIB_LAPACK_DIR)/TIMING; $(TAR) zxf ../../large.tgz )
 -      make -C $(NETLIB_LAPACK_DIR) tmglib
        make -C $(NETLIB_LAPACK_DIR)/TIMING
  endif
  
  
  lapack-test :
 -      make -j 1 -C $(NETLIB_LAPACK_DIR) tmglib
 +      (cd $(NETLIB_LAPACK_DIR)/TESTING && rm -f x* *.out)
        make -j 1 -C $(NETLIB_LAPACK_DIR)/TESTING xeigtstc  xeigtstd  xeigtsts  xeigtstz  xlintstc  xlintstd  xlintstds  xlintstrfd  xlintstrfz  xlintsts  xlintstz  xlintstzc xlintstrfs xlintstrfc
        (cd $(NETLIB_LAPACK_DIR); ./lapack_testing.py -r )
  
@@@ -298,5 -296,4 +303,5 @@@ endi
        @$(MAKE) -C $(NETLIB_LAPACK_DIR) clean
        @rm -f $(NETLIB_LAPACK_DIR)/make.inc $(NETLIB_LAPACK_DIR)/lapacke/include/lapacke_mangling.h
        @rm -f *.grd Makefile.conf_last config_last.h
 +      @(cd $(NETLIB_LAPACK_DIR)/TESTING && rm -f x* *.out testing_results.txt)
        @echo Done.