| リビジョン | fadbf6ca27e050a6398570a8b7b18aa87ea3462d (tree) |
|---|---|
| 日時 | 2013-01-02 03:44:53 |
| 作者 | Katsuhiko Nishimra <ktns.87@gmai...> |
| コミッター | Katsuhiko Nishimra |
Remove duplicate OpenBLAS flags from Makefile.am. #28588
git-svn-id: https://svn.sourceforge.jp/svnroot/molds/branches/automake@1229 1136aad2-a195-0410-b898-f5ea1d11b9d8
src/Makefile.am (diff) src/configure.ac (diff)| @@ -40,13 +40,5 @@ MolDS_SOURCES = Main.cpp base/MolDSException.cpp wrappers/Blas.cpp \ | ||
| 40 | 40 | |
| 41 | 41 | ACLOCAL_AMFLAGS = -I m4 |
| 42 | 42 | AM_CXXFLAGS=$(OPENMP_CXXFLAGS) |
| 43 | -AM_CPPFLAGS= | |
| 44 | -AM_LDFLAGS= | |
| 45 | -if USE_OPENBLAS_DIR | |
| 46 | -OPENBLAS_INCLUDE_DIR=$(OPENBLAS_ROOT)/include | |
| 47 | -OPENBLAS_LIB_DIR=$(OPENBLAS_ROOT)/lib | |
| 48 | -AM_CPPFLAGS+= -I$(OPENBLAS_INCLUDE_DIR) | |
| 49 | -AM_LDFLAGS+= -L$(OPENBLAS_LIB_DIR) | |
| 50 | -AM_CPPFLAGS+= $(BOOST_CPPLAGS) | |
| 51 | -AM_LDFLAGS+= $(BOOST_LDFLAGS) | |
| 52 | -endif | |
| 43 | +AM_CPPFLAGS=$(BOOST_CPPLAGS) | |
| 44 | +AM_LDFLAGS=$(BOOST_LDFLAGS) |
| @@ -83,8 +83,6 @@ AC_ARG_WITH([openblas], | ||
| 83 | 83 | LDFLAGS="$LDFLAGS -L$OPENBLAS_ROOT/lib"], |
| 84 | 84 | [AC_MSG_FAILURE([Cannot find directory `$withval'!])])])], |
| 85 | 85 | [OPENBLAS_ROOT=]) |
| 86 | -AM_CONDITIONAL([USE_OPENBLAS_DIR], [test x != x$OPENBLAS_ROOT]) | |
| 87 | -AC_SUBST([OPENBLAS_ROOT]) | |
| 88 | 86 | |
| 89 | 87 | dnl Check for BLAS |
| 90 | 88 | AX_BLAS(,[AC_MSG_FAILURE([Cannot find BLAS library!])]) |
Fork