diff options
| -rw-r--r-- | configure.ac | 190 | ||||
| -rw-r--r-- | src/fortran/blas/Makefile.in | 16 | ||||
| -rw-r--r-- | src/fortran/lapack/Makefile.am | 2 | ||||
| -rw-r--r-- | src/fortran/lapack/Makefile.in | 20 |
4 files changed, 122 insertions, 106 deletions
diff --git a/configure.ac b/configure.ac index bbfb8408..fa560a90 100644 --- a/configure.ac +++ b/configure.ac @@ -157,101 +157,101 @@ fi AC_CONFIG_FILES([ Makefile -lib/blas/Makefile -lib/lapack/Makefile -type/Makefile -operations/Makefile -operations/addition/Makefile -operations/subtraction/Makefile -operations/division/Makefile -operations/multiplication/Makefile -matrixOperations/Makefile -matrixOperations/multiplication/Makefile -matrixOperations/division/Makefile -matrixOperations/cat/Makefile -matrixOperations/transpose/Makefile -matrixOperations/trace/Makefile -matrixOperations/hilbert/Makefile -matrixOperations/expm/Makefile -matrixOperations/eye/Makefile -matrixOperations/ones/Makefile -matrixOperations/infiniteNorm/Makefile -matrixOperations/inversion/Makefile -matrixOperations/jmat/Makefile -matrixOperations/chol/Makefile -matrixOperations/determ/Makefile -matrixOperations/dist/Makefile -matrixOperations/fill/Makefile -matrixOperations/magnitude/Makefile -matrixOperations/squaredMagnitude/Makefile -matrixOperations/logm/Makefile -matrixOperations/powm/Makefile -matrixOperations/zeros/Makefile -matrixOperations/spec/Makefile -matrixOperations/spec2/Makefile -implicitList/Makefile -elementaryFunctions/Makefile -elementaryFunctions/cos/Makefile -elementaryFunctions/cosh/Makefile -elementaryFunctions/acos/Makefile -elementaryFunctions/acosh/Makefile -elementaryFunctions/sin/Makefile -elementaryFunctions/sinh/Makefile -elementaryFunctions/asin/Makefile -elementaryFunctions/asinh/Makefile -elementaryFunctions/tan/Makefile -elementaryFunctions/tanh/Makefile -elementaryFunctions/atan/Makefile -elementaryFunctions/atan2/Makefile -elementaryFunctions/atanh/Makefile -elementaryFunctions/log/Makefile -elementaryFunctions/log1p/Makefile -elementaryFunctions/log10/Makefile -elementaryFunctions/exp/Makefile -elementaryFunctions/exp10/Makefile -elementaryFunctions/sqrt/Makefile -elementaryFunctions/lnp1m1/Makefile -elementaryFunctions/pow/Makefile -elementaryFunctions/ceil/Makefile -elementaryFunctions/fix/Makefile -elementaryFunctions/floor/Makefile -elementaryFunctions/int/Makefile -elementaryFunctions/round/Makefile -auxiliaryFunctions/Makefile -auxiliaryFunctions/abs/Makefile -auxiliaryFunctions/find/Makefile -auxiliaryFunctions/find2d/Makefile -auxiliaryFunctions/frexp/Makefile -auxiliaryFunctions/isempty/Makefile -auxiliaryFunctions/isnan/Makefile -auxiliaryFunctions/rand/Makefile -auxiliaryFunctions/sign/Makefile -auxiliaryFunctions/size/Makefile -auxiliaryFunctions/length/Makefile -auxiliaryFunctions/type/Makefile -auxiliaryFunctions/pythag/Makefile -auxiliaryFunctions/conj/Makefile -statisticsFunctions/Makefile -statisticsFunctions/mean/Makefile -statisticsFunctions/prod/Makefile -statisticsFunctions/sum/Makefile -statisticsFunctions/variance/Makefile -statisticsFunctions/max/Makefile -statisticsFunctions/min/Makefile -string/Makefile -string/disp/Makefile -string/string/Makefile -signalProcessing/Makefile -signalProcessing/fft/Makefile -signalProcessing/ifft/Makefile -signalProcessing/levin/Makefile -signalProcessing/conv/Makefile -signalProcessing/conv2d/Makefile -signalProcessing/hilbert/Makefile -signalProcessing/crossCorr/Makefile -signalProcessing/lpc2cep/Makefile -signalProcessing/lev/Makefile -signalProcessing/fftshift/Makefile +src/fortran/blas/Makefile +src/fortran/lapack/Makefile +src/c/type/Makefile +src/c/operations/Makefile +src/c/operations/addition/Makefile +src/c/operations/subtraction/Makefile +src/c/operations/division/Makefile +src/c/operations/multiplication/Makefile +src/c/matrixOperations/Makefile +src/c/matrixOperations/multiplication/Makefile +src/c/matrixOperations/division/Makefile +src/c/matrixOperations/cat/Makefile +src/c/matrixOperations/transpose/Makefile +src/c/matrixOperations/trace/Makefile +src/c/matrixOperations/hilbert/Makefile +src/c/matrixOperations/expm/Makefile +src/c/matrixOperations/eye/Makefile +src/c/matrixOperations/ones/Makefile +src/c/matrixOperations/infiniteNorm/Makefile +src/c/matrixOperations/inversion/Makefile +src/c/matrixOperations/jmat/Makefile +src/c/matrixOperations/chol/Makefile +src/c/matrixOperations/determ/Makefile +src/c/matrixOperations/dist/Makefile +src/c/matrixOperations/fill/Makefile +src/c/matrixOperations/magnitude/Makefile +src/c/matrixOperations/squaredMagnitude/Makefile +src/c/matrixOperations/logm/Makefile +src/c/matrixOperations/powm/Makefile +src/c/matrixOperations/zeros/Makefile +src/c/matrixOperations/spec/Makefile +src/c/matrixOperations/spec2/Makefile +src/c/implicitList/Makefile +src/c/elementaryFunctions/Makefile +src/c/elementaryFunctions/cos/Makefile +src/c/elementaryFunctions/cosh/Makefile +src/c/elementaryFunctions/acos/Makefile +src/c/elementaryFunctions/acosh/Makefile +src/c/elementaryFunctions/sin/Makefile +src/c/elementaryFunctions/sinh/Makefile +src/c/elementaryFunctions/asin/Makefile +src/c/elementaryFunctions/asinh/Makefile +src/c/elementaryFunctions/tan/Makefile +src/c/elementaryFunctions/tanh/Makefile +src/c/elementaryFunctions/atan/Makefile +src/c/elementaryFunctions/atan2/Makefile +src/c/elementaryFunctions/atanh/Makefile +src/c/elementaryFunctions/log/Makefile +src/c/elementaryFunctions/log1p/Makefile +src/c/elementaryFunctions/log10/Makefile +src/c/elementaryFunctions/exp/Makefile +src/c/elementaryFunctions/exp10/Makefile +src/c/elementaryFunctions/sqrt/Makefile +src/c/elementaryFunctions/lnp1m1/Makefile +src/c/elementaryFunctions/pow/Makefile +src/c/elementaryFunctions/ceil/Makefile +src/c/elementaryFunctions/fix/Makefile +src/c/elementaryFunctions/floor/Makefile +src/c/elementaryFunctions/int/Makefile +src/c/elementaryFunctions/round/Makefile +src/c/auxiliaryFunctions/Makefile +src/c/auxiliaryFunctions/abs/Makefile +src/c/auxiliaryFunctions/find/Makefile +src/c/auxiliaryFunctions/find2d/Makefile +src/c/auxiliaryFunctions/frexp/Makefile +src/c/auxiliaryFunctions/isempty/Makefile +src/c/auxiliaryFunctions/isnan/Makefile +src/c/auxiliaryFunctions/rand/Makefile +src/c/auxiliaryFunctions/sign/Makefile +src/c/auxiliaryFunctions/size/Makefile +src/c/auxiliaryFunctions/length/Makefile +src/c/auxiliaryFunctions/type/Makefile +src/c/auxiliaryFunctions/pythag/Makefile +src/c/auxiliaryFunctions/conj/Makefile +src/c/statisticsFunctions/Makefile +src/c/statisticsFunctions/mean/Makefile +src/c/statisticsFunctions/prod/Makefile +src/c/statisticsFunctions/sum/Makefile +src/c/statisticsFunctions/variance/Makefile +src/c/statisticsFunctions/max/Makefile +src/c/statisticsFunctions/min/Makefile +src/c/string/Makefile +src/c/string/disp/Makefile +src/c/string/string/Makefile +src/c/signalProcessing/Makefile +src/c/signalProcessing/fft/Makefile +src/c/signalProcessing/ifft/Makefile +src/c/signalProcessing/levin/Makefile +src/c/signalProcessing/conv/Makefile +src/c/signalProcessing/conv2d/Makefile +src/c/signalProcessing/hilbert/Makefile +src/c/signalProcessing/crossCorr/Makefile +src/c/signalProcessing/lpc2cep/Makefile +src/c/signalProcessing/lev/Makefile +src/c/signalProcessing/fftshift/Makefile ]) diff --git a/src/fortran/blas/Makefile.in b/src/fortran/blas/Makefile.in index 05f78eab..23f592e7 100644 --- a/src/fortran/blas/Makefile.in +++ b/src/fortran/blas/Makefile.in @@ -37,7 +37,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = lib/blas +subdir = src/fortran/blas DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -112,7 +112,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -120,24 +120,30 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBMATH = @LIBMATH@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -157,6 +163,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -188,6 +195,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -292,9 +300,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/blas/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/fortran/blas/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign lib/blas/Makefile + $(AUTOMAKE) --foreign src/fortran/blas/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/fortran/lapack/Makefile.am b/src/fortran/lapack/Makefile.am index 13904af1..4bfc54d6 100644 --- a/src/fortran/lapack/Makefile.am +++ b/src/fortran/lapack/Makefile.am @@ -311,7 +311,7 @@ libdummy_lapack_la_FFLAGS = `echo "@FFLAGS@"| sed -e 's|-O[0-9+]|-O0|'` libscilapack_la_LIBADD = libdummy-lapack.la \ - $(top_builddir)/lib/blas/libsciblas.la + $(top_builddir)/src/fortran/blas/libsciblas.la libscilapack_la_PKGCONFIG = lapack.pc diff --git a/src/fortran/lapack/Makefile.in b/src/fortran/lapack/Makefile.in index 51b22b91..5efd96ca 100644 --- a/src/fortran/lapack/Makefile.in +++ b/src/fortran/lapack/Makefile.in @@ -37,7 +37,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = lib/lapack +subdir = src/fortran/lapack DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -64,7 +64,7 @@ libdummy_lapack_la_LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) \ $(libdummy_lapack_la_FFLAGS) $(FFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ libscilapack_la_DEPENDENCIES = libdummy-lapack.la \ - $(top_builddir)/lib/blas/libsciblas.la + $(top_builddir)/src/fortran/blas/libsciblas.la am__objects_1 = am__objects_2 = dlasv2.lo zgeqpf.lo zrot.lo dpotrf.lo zunmr3.lo \ zlanhs.lo zgebak.lo zbdsqr.lo zunmrz.lo dgetc2.lo zlaqp2.lo \ @@ -160,7 +160,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -168,24 +168,30 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ +FGREP = @FGREP@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LIBMATH = @LIBMATH@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +NM = @NM@ NMEDIT = @NMEDIT@ OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -205,6 +211,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ ac_ct_F77 = @ac_ct_F77@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -236,6 +243,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -551,7 +559,7 @@ libscilapack_la_SOURCES = $(HEAD) $(LAPACK_FORTRAN_SOURCES) libdummy_lapack_la_SOURCES = dlamch.f slamch.f libdummy_lapack_la_FFLAGS = `echo "@FFLAGS@"| sed -e 's|-O[0-9+]|-O0|'` libscilapack_la_LIBADD = libdummy-lapack.la \ - $(top_builddir)/lib/blas/libsciblas.la + $(top_builddir)/src/fortran/blas/libsciblas.la libscilapack_la_PKGCONFIG = lapack.pc all: all-am @@ -567,9 +575,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/lapack/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/fortran/lapack/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign lib/lapack/Makefile + $(AUTOMAKE) --foreign src/fortran/lapack/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ |