summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortorset2008-12-22 09:08:38 +0000
committertorset2008-12-22 09:08:38 +0000
commitb92c515ef446d7344073caa42b8c5ad59d89004b (patch)
tree838e1365301583f4d1036807e14d7ad0fb181e1b /src
parent3e4e743b2d1cb50bc442bc8fc568e29d48c7580a (diff)
downloadscilab2c-b92c515ef446d7344073caa42b8c5ad59d89004b.tar.gz
scilab2c-b92c515ef446d7344073caa42b8c5ad59d89004b.tar.bz2
scilab2c-b92c515ef446d7344073caa42b8c5ad59d89004b.zip
nomsg
Diffstat (limited to 'src')
-rwxr-xr-xsrc/configure7
-rw-r--r--src/configure.ac2
-rw-r--r--src/elementaryFunctions/pow/Makefile.am2
-rw-r--r--src/elementaryFunctions/pow/Makefile.in6
-rw-r--r--src/matrixOperations/Makefile.am12
-rw-r--r--src/matrixOperations/Makefile.in6
6 files changed, 25 insertions, 10 deletions
diff --git a/src/configure b/src/configure
index 86380921..70bf49c5 100755
--- a/src/configure
+++ b/src/configure
@@ -22149,7 +22149,7 @@ fi
#operations/multiplication/Makefile
#operations/division/Makefile
-ac_config_files="$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/addition/Makefile matrixOperations/subtraction/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 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 auxiliaryFunctions/Makefile auxiliaryFunctions/abs/Makefile auxiliaryFunctions/find/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/sum/Makefile statisticsFunctions/variance/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"
+ac_config_files="$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/addition/Makefile matrixOperations/subtraction/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 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 auxiliaryFunctions/Makefile auxiliaryFunctions/abs/Makefile auxiliaryFunctions/find/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/sum/Makefile statisticsFunctions/variance/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"
@@ -22786,6 +22786,10 @@ do
"matrixOperations/jmat/Makefile") CONFIG_FILES="$CONFIG_FILES matrixOperations/jmat/Makefile" ;;
"matrixOperations/chol/Makefile") CONFIG_FILES="$CONFIG_FILES matrixOperations/chol/Makefile" ;;
"matrixOperations/determ/Makefile") CONFIG_FILES="$CONFIG_FILES matrixOperations/determ/Makefile" ;;
+ "matrixOperations/dist/Makefile") CONFIG_FILES="$CONFIG_FILES matrixOperations/dist/Makefile" ;;
+ "matrixOperations/fill/Makefile") CONFIG_FILES="$CONFIG_FILES matrixOperations/fill/Makefile" ;;
+ "matrixOperations/magnitude/Makefile") CONFIG_FILES="$CONFIG_FILES matrixOperations/magnitude/Makefile" ;;
+ "matrixOperations/squaredMagnitude/Makefile") CONFIG_FILES="$CONFIG_FILES matrixOperations/squaredMagnitude/Makefile" ;;
"implicitList/Makefile") CONFIG_FILES="$CONFIG_FILES implicitList/Makefile" ;;
"elementaryFunctions/Makefile") CONFIG_FILES="$CONFIG_FILES elementaryFunctions/Makefile" ;;
"elementaryFunctions/cos/Makefile") CONFIG_FILES="$CONFIG_FILES elementaryFunctions/cos/Makefile" ;;
@@ -22835,6 +22839,7 @@ do
"signalProcessing/levin/Makefile") CONFIG_FILES="$CONFIG_FILES signalProcessing/levin/Makefile" ;;
"signalProcessing/conv/Makefile") CONFIG_FILES="$CONFIG_FILES signalProcessing/conv/Makefile" ;;
"signalProcessing/conv2d/Makefile") CONFIG_FILES="$CONFIG_FILES signalProcessing/conv2d/Makefile" ;;
+ "signalProcessing/hilbert/Makefile") CONFIG_FILES="$CONFIG_FILES signalProcessing/hilbert/Makefile" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
diff --git a/src/configure.ac b/src/configure.ac
index 31498b49..ac4e5e82 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -184,6 +184,8 @@ matrixOperations/chol/Makefile
matrixOperations/determ/Makefile
matrixOperations/dist/Makefile
matrixOperations/fill/Makefile
+matrixOperations/magnitude/Makefile
+matrixOperations/squaredMagnitude/Makefile
implicitList/Makefile
elementaryFunctions/Makefile
elementaryFunctions/cos/Makefile
diff --git a/src/elementaryFunctions/pow/Makefile.am b/src/elementaryFunctions/pow/Makefile.am
index f9814fff..328a3e91 100644
--- a/src/elementaryFunctions/pow/Makefile.am
+++ b/src/elementaryFunctions/pow/Makefile.am
@@ -42,7 +42,6 @@ check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
check_LDADD = $(top_builddir)/lib/lapack/libscilapack.la \
$(top_builddir)/type/libDoubleComplex.la \
$(top_builddir)/type/libFloatComplex.la \
- $(top_builddir)/operations/addition/libAddition.la \
$(top_builddir)/elementaryFunctions/pow/libPow.la \
$(top_builddir)/elementaryFunctions/exp/libExp.la \
$(top_builddir)/elementaryFunctions/log/libLog.la \
@@ -56,6 +55,7 @@ check_LDADD = $(top_builddir)/lib/lapack/libscilapack.la \
$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
$(top_builddir)/operations/multiplication/libMultiplication.la \
+ $(top_builddir)/operations/addition/libAddition.la \
@LIBMATH@
check_PROGRAMS = testFloatPow testDoublePow
diff --git a/src/elementaryFunctions/pow/Makefile.in b/src/elementaryFunctions/pow/Makefile.in
index e3008c99..5e35dd8d 100644
--- a/src/elementaryFunctions/pow/Makefile.in
+++ b/src/elementaryFunctions/pow/Makefile.in
@@ -67,7 +67,6 @@ testDoublePow_OBJECTS = $(am_testDoublePow_OBJECTS)
am__DEPENDENCIES_1 = $(top_builddir)/lib/lapack/libscilapack.la \
$(top_builddir)/type/libDoubleComplex.la \
$(top_builddir)/type/libFloatComplex.la \
- $(top_builddir)/operations/addition/libAddition.la \
$(top_builddir)/elementaryFunctions/pow/libPow.la \
$(top_builddir)/elementaryFunctions/exp/libExp.la \
$(top_builddir)/elementaryFunctions/log/libLog.la \
@@ -80,7 +79,8 @@ am__DEPENDENCIES_1 = $(top_builddir)/lib/lapack/libscilapack.la \
$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
- $(top_builddir)/operations/multiplication/libMultiplication.la
+ $(top_builddir)/operations/multiplication/libMultiplication.la \
+ $(top_builddir)/operations/addition/libAddition.la
testDoublePow_DEPENDENCIES = $(am__DEPENDENCIES_1)
testDoublePow_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoublePow_CFLAGS) \
@@ -248,7 +248,6 @@ check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
check_LDADD = $(top_builddir)/lib/lapack/libscilapack.la \
$(top_builddir)/type/libDoubleComplex.la \
$(top_builddir)/type/libFloatComplex.la \
- $(top_builddir)/operations/addition/libAddition.la \
$(top_builddir)/elementaryFunctions/pow/libPow.la \
$(top_builddir)/elementaryFunctions/exp/libExp.la \
$(top_builddir)/elementaryFunctions/log/libLog.la \
@@ -262,6 +261,7 @@ check_LDADD = $(top_builddir)/lib/lapack/libscilapack.la \
$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
$(top_builddir)/operations/multiplication/libMultiplication.la \
+ $(top_builddir)/operations/addition/libAddition.la \
@LIBMATH@
testFloatPow_SOURCES = testPow.h testFloatPow.c
diff --git a/src/matrixOperations/Makefile.am b/src/matrixOperations/Makefile.am
index e59299c9..25d3c5b2 100644
--- a/src/matrixOperations/Makefile.am
+++ b/src/matrixOperations/Makefile.am
@@ -25,7 +25,11 @@ SUBDIRS= addition \
jmat \
inversion\
chol \
- determ
-
-
-
+ determ \
+ dist \
+ fill \
+ magnitude \
+ squaredMagnitude
+
+
+
diff --git a/src/matrixOperations/Makefile.in b/src/matrixOperations/Makefile.in
index e3dc1550..605aae7a 100644
--- a/src/matrixOperations/Makefile.in
+++ b/src/matrixOperations/Makefile.in
@@ -180,7 +180,11 @@ SUBDIRS = addition \
jmat \
inversion\
chol \
- determ
+ determ \
+ dist \
+ fill \
+ magnitude \
+ squaredMagnitude
all: all-recursive