diff --git a/configure.ac b/configure.ac index 5f3a8a75c..123b62c49 100644 --- a/configure.ac +++ b/configure.ac @@ -61,6 +61,7 @@ AC_OUTPUT(Makefile examples/Makefile \ ext/Makefile \ ext/tpx/Makefile \ ext/math/Makefile \ + ext/blas/Makefile \ ext/cvode/Makefile \ ext/lapack/Makefile \ Cantera/Makefile \ diff --git a/examples/cxx/Makefile.am b/examples/cxx/Makefile.am index 3079ac8e7..19abff458 100644 --- a/examples/cxx/Makefile.am +++ b/examples/cxx/Makefile.am @@ -8,7 +8,8 @@ cc_sources = examples.cpp kinetics_example1.cpp kinetics_example2.cpp \ LINK = -lkinetics -ltransport -lthermo -lctnumerics LINK += -lctbase -ltpx -lctmath -lconverters LINK += -luser -lcvode -lstdc++ -lctlapack -# -lctblas -lctf2c -lctcxx -luser -lstdc++ +LINK += -lctblas +# -lctf2c -lctcxx -luser -lstdc++ LIBS = -L$(top_builddir)/build/lib/ $(LINK) diff --git a/ext/Makefile.am b/ext/Makefile.am index 20d006bb4..797cbfad0 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -1,2 +1,2 @@ -SUBDIRS = tpx math cvode lapack +SUBDIRS = tpx math cvode lapack blas diff --git a/ext/blas/Makefile.am b/ext/blas/Makefile.am new file mode 100644 index 000000000..3bdd18206 --- /dev/null +++ b/ext/blas/Makefile.am @@ -0,0 +1,24 @@ +fc_sources = dasum.f dcabs1.f ddot.f dgemm.f dger.f drot.f drotm.f \ + dsbmv.f dsdot.f dspr2.f dswap.f dsymv.f dsyr2k.f \ + dsyrk.f dtbsv.f dtpsv.f dtrmv.f dtrsv.f dznrm2.f \ + idamax.f izamax.f xerbla.f daxpy.f dcopy.f dgbmv.f \ + dgemv.f dnrm2.f drotg.f drotmg.f dscal.f dspmv.f \ + dspr.f dsymm.f dsyr2.f dsyr.f dtbmv.f dtpmv.f dtrmm.f \ + dtrsm.f dzasum.f icamax.f isamax.f lsame.f + +INCLUDES = +AM_CXXFLAGS = $(INCLUDES) +AM_FCFLAGS = $(INCLUDES) + +lib_LTLIBRARIES = $(top_builddir)/build/lib/libctblas.la +library_includedir = $(top_builddir)/build/include +library_include_HEADERS = $(h_sources) + +#----------------------- +# Cantera Converters C/C++ library +#----------------------- + +__top_builddir__build_lib_libctblas_la_LDFLAGS = $(all_libraries) -release $(GENERIC_RELEASE) +__top_builddir__build_lib_libctblas_la_SOURCES = $(fc_sources) $(cc_sources) + +CLEANFILES = *.o diff --git a/ext/blas/Makefile.in b/ext/blas/Makefile.in deleted file mode 100755 index caef518a0..000000000 --- a/ext/blas/Makefile.in +++ /dev/null @@ -1,78 +0,0 @@ -#/bin/sh -# $License$ -# -# $Id: Makefile.in,v 1.8 2008/12/30 21:49:41 hkmoffa Exp $ -# -do_ranlib = @DO_RANLIB@ -BLASLIB = @buildlib@/libctblas.a - -SUFFIXES= -SUFFIXES= .f .o - -PURIFY=@PURIFY@ - -PIC_FLAG=@PIC@ - -F_FLAGS = @FFLAGS@ $(PIC_FLAG) - -OBJS = \ -dasum.o \ -daxpy.o \ -dcabs1.o \ -dcopy.o \ -ddot.o \ -dgbmv.o \ -dgemm.o \ -dgemv.o \ -dger.o \ -dnrm2.o \ -drot.o \ -drotg.o \ -drotm.o \ -drotmg.o \ -dsbmv.o \ -dscal.o \ -dsdot.o \ -dspmv.o \ -dspr.o \ -dspr2.o \ -dswap.o \ -dsymm.o \ -dsymv.o \ -dsyr.o \ -dsyr2.o \ -dsyr2k.o \ -dsyrk.o \ -dtbmv.o \ -dtbsv.o \ -dtpmv.o \ -dtpsv.o \ -dtrmm.o \ -dtrmv.o \ -dtrsm.o \ -dtrsv.o \ -dzasum.o \ -idamax.o \ -lsame.o \ -xerbla.o - -# dznrm2.o \ - - -#SRCS = $(OBJS:.o=.cpp) - - -$(BLASLIB): $(OBJS) - @ARCHIVE@ $(BLASLIB) $(OBJS) > /dev/null -ifeq ($(do_ranlib),1) - @RANLIB@ $(ZEROD_LIB) -endif - -%.o : %.f - $(PURIFY) @F77@ -c $< $(F_FLAGS) - -clean: - $(RM) $(OBJS) $(BLASLIB) - -depends: -