diff options
author | torset | 2008-11-13 08:53:04 +0000 |
---|---|---|
committer | torset | 2008-11-13 08:53:04 +0000 |
commit | fbb4b7c8d67e1e6a98bce659ab5ec18fd3362d13 (patch) | |
tree | c8b12bbb58726a21a6339cce4ba9e909cd285816 /src/auxiliaryFunctions | |
parent | e4bf45d022a05af69e506fec2c9bde6ec105905a (diff) | |
download | scilab2c-fbb4b7c8d67e1e6a98bce659ab5ec18fd3362d13.tar.gz scilab2c-fbb4b7c8d67e1e6a98bce659ab5ec18fd3362d13.tar.bz2 scilab2c-fbb4b7c8d67e1e6a98bce659ab5ec18fd3362d13.zip |
change repertory for the multiplication and division and made the modifs in the files using them.
Diffstat (limited to 'src/auxiliaryFunctions')
-rw-r--r-- | src/auxiliaryFunctions/abs/Makefile.am | 1 | ||||
-rw-r--r-- | src/auxiliaryFunctions/abs/Makefile.in | 4 | ||||
-rw-r--r-- | src/auxiliaryFunctions/conj/Makefile.am | 1 | ||||
-rw-r--r-- | src/auxiliaryFunctions/conj/Makefile.in | 1 | ||||
-rw-r--r-- | src/auxiliaryFunctions/frexp/Makefile.am | 3 | ||||
-rw-r--r-- | src/auxiliaryFunctions/frexp/Makefile.in | 3 | ||||
-rw-r--r-- | src/auxiliaryFunctions/includes/pythag.h | 3 | ||||
-rw-r--r-- | src/auxiliaryFunctions/pythag/Makefile.am | 1 | ||||
-rw-r--r-- | src/auxiliaryFunctions/pythag/Makefile.in | 4 | ||||
-rw-r--r-- | src/auxiliaryFunctions/sign/Makefile.am | 1 | ||||
-rw-r--r-- | src/auxiliaryFunctions/sign/Makefile.in | 4 |
11 files changed, 21 insertions, 5 deletions
diff --git a/src/auxiliaryFunctions/abs/Makefile.am b/src/auxiliaryFunctions/abs/Makefile.am index 09a84011..88240c22 100644 --- a/src/auxiliaryFunctions/abs/Makefile.am +++ b/src/auxiliaryFunctions/abs/Makefile.am @@ -46,6 +46,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ check_PROGRAMS = testFloatAbs testDoubleAbs diff --git a/src/auxiliaryFunctions/abs/Makefile.in b/src/auxiliaryFunctions/abs/Makefile.in index 046714dd..a1a2bdda 100644 --- a/src/auxiliaryFunctions/abs/Makefile.in +++ b/src/auxiliaryFunctions/abs/Makefile.in @@ -70,7 +70,8 @@ am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/lib/lapack/libscilapack.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la + $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la testDoubleAbs_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoubleAbs_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleAbs_CFLAGS) \ @@ -242,6 +243,7 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ diff --git a/src/auxiliaryFunctions/conj/Makefile.am b/src/auxiliaryFunctions/conj/Makefile.am index 22a85a74..900e2aec 100644 --- a/src/auxiliaryFunctions/conj/Makefile.am +++ b/src/auxiliaryFunctions/conj/Makefile.am @@ -37,6 +37,7 @@ check_LDADD = libConj.la \ $(top_builddir)/elementaryFunctions/atan2/libAtan2.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la diff --git a/src/auxiliaryFunctions/conj/Makefile.in b/src/auxiliaryFunctions/conj/Makefile.in index 0c214b52..0097d238 100644 --- a/src/auxiliaryFunctions/conj/Makefile.in +++ b/src/auxiliaryFunctions/conj/Makefile.in @@ -215,6 +215,7 @@ check_LDADD = libConj.la \ $(top_builddir)/elementaryFunctions/atan2/libAtan2.la \ $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la check_INCLUDES = -I $(top_builddir)/type \ diff --git a/src/auxiliaryFunctions/frexp/Makefile.am b/src/auxiliaryFunctions/frexp/Makefile.am index 2fdccca1..ffb4d9ee 100644 --- a/src/auxiliaryFunctions/frexp/Makefile.am +++ b/src/auxiliaryFunctions/frexp/Makefile.am @@ -12,6 +12,7 @@ libFrexp_la_CFLAGS = -I $(top_builddir)/type \ -I $(top_builddir)/includes \ + -I $(top_builddir)/operations/includes \ -I $(top_builddir)/elementaryFunctions/includes \ -I $(top_builddir)/auxiliaryFunctions/includes @@ -47,10 +48,12 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/pow/libPow.la \ $(top_builddir)/lib/lapack/libscilapack.la \ $(top_builddir)/lib/blas/libsciblas.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ libFrexp.la check_INCLUDES = -I $(top_builddir)/type \ -I $(top_builddir)/includes \ + -I $(top_builddir)/operations/includes \ -I $(top_builddir)/elementaryFunctions/includes \ -I $(top_builddir)/auxiliaryFunctions/includes diff --git a/src/auxiliaryFunctions/frexp/Makefile.in b/src/auxiliaryFunctions/frexp/Makefile.in index 992d5a66..2e59c3e6 100644 --- a/src/auxiliaryFunctions/frexp/Makefile.in +++ b/src/auxiliaryFunctions/frexp/Makefile.in @@ -195,6 +195,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ libFrexp_la_CFLAGS = -I $(top_builddir)/type \ -I $(top_builddir)/includes \ + -I $(top_builddir)/operations/includes \ -I $(top_builddir)/elementaryFunctions/includes \ -I $(top_builddir)/auxiliaryFunctions/includes @@ -225,10 +226,12 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/pow/libPow.la \ $(top_builddir)/lib/lapack/libscilapack.la \ $(top_builddir)/lib/blas/libsciblas.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ libFrexp.la check_INCLUDES = -I $(top_builddir)/type \ -I $(top_builddir)/includes \ + -I $(top_builddir)/operations/includes \ -I $(top_builddir)/elementaryFunctions/includes \ -I $(top_builddir)/auxiliaryFunctions/includes diff --git a/src/auxiliaryFunctions/includes/pythag.h b/src/auxiliaryFunctions/includes/pythag.h index ecf5b11f..a6e469eb 100644 --- a/src/auxiliaryFunctions/includes/pythag.h +++ b/src/auxiliaryFunctions/includes/pythag.h @@ -13,8 +13,7 @@ #ifndef __PYTHAG_H__ #define __PYTHAG_H__ -#include "floatComplex.h" -#include "doubleComplex.h" +#include "multiplication.h" #include "addition.h" #include "sqrt.h" diff --git a/src/auxiliaryFunctions/pythag/Makefile.am b/src/auxiliaryFunctions/pythag/Makefile.am index 524a4c6e..1d68e54a 100644 --- a/src/auxiliaryFunctions/pythag/Makefile.am +++ b/src/auxiliaryFunctions/pythag/Makefile.am @@ -54,4 +54,5 @@ testPythag_LDADD = $(top_builddir)/type/libFloatComplex.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ diff --git a/src/auxiliaryFunctions/pythag/Makefile.in b/src/auxiliaryFunctions/pythag/Makefile.in index 61043f39..52eb153f 100644 --- a/src/auxiliaryFunctions/pythag/Makefile.in +++ b/src/auxiliaryFunctions/pythag/Makefile.in @@ -70,7 +70,8 @@ testPythag_DEPENDENCIES = $(top_builddir)/type/libFloatComplex.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la + $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la testPythag_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testPythag_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -238,6 +239,7 @@ testPythag_LDADD = $(top_builddir)/type/libFloatComplex.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ all: all-am diff --git a/src/auxiliaryFunctions/sign/Makefile.am b/src/auxiliaryFunctions/sign/Makefile.am index fe1df3e1..bbe1993f 100644 --- a/src/auxiliaryFunctions/sign/Makefile.am +++ b/src/auxiliaryFunctions/sign/Makefile.am @@ -56,4 +56,5 @@ testSign_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ $(top_builddir)/auxiliaryFunctions/sign/libSign.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ diff --git a/src/auxiliaryFunctions/sign/Makefile.in b/src/auxiliaryFunctions/sign/Makefile.in index 0ba405f9..feb4ca08 100644 --- a/src/auxiliaryFunctions/sign/Makefile.in +++ b/src/auxiliaryFunctions/sign/Makefile.in @@ -71,7 +71,8 @@ testSign_DEPENDENCIES = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ - $(top_builddir)/auxiliaryFunctions/sign/libSign.la + $(top_builddir)/auxiliaryFunctions/sign/libSign.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la testSign_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(testSign_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ @@ -241,6 +242,7 @@ testSign_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ $(top_builddir)/auxiliaryFunctions/sign/libSign.la \ + $(top_builddir)/operations/multiplication/libMultiplication.la \ @LIBMATH@ all: all-am |