summaryrefslogtreecommitdiffstats
path: root/scilab/modules/elementary_functions
diff options
context:
space:
mode:
authorVincent COUVERT <vincent.couvert@scilab.org>2010-02-10 16:07:05 +0100
committerVincent COUVERT <vincent.couvert@scilab.org>2010-02-10 16:07:05 +0100
commit736f547fa527194eaf222d8b72290d0f09383139 (patch)
treef7843c9cef558ac4d3647e52e780f5887fe0f8b5 /scilab/modules/elementary_functions
parentcbae9e183a49a3da06a04e2bfebf70e23f609279 (diff)
parent7c6957ed62b95d41233d9e254397cb9dd3b78423 (diff)
downloadscilab-736f547fa527194eaf222d8b72290d0f09383139.zip
scilab-736f547fa527194eaf222d8b72290d0f09383139.tar.gz
Merge commit 'origin/5.2'
Diffstat (limited to 'scilab/modules/elementary_functions')
-rw-r--r--scilab/modules/elementary_functions/Makefile.am5
-rw-r--r--scilab/modules/elementary_functions/Makefile.in15
2 files changed, 9 insertions, 11 deletions
diff --git a/scilab/modules/elementary_functions/Makefile.am b/scilab/modules/elementary_functions/Makefile.am
index 7c94f33..1254bf7 100644
--- a/scilab/modules/elementary_functions/Makefile.am
+++ b/scilab/modules/elementary_functions/Makefile.am
@@ -119,7 +119,7 @@ src/fortran/slatec/pchim.f
119 119
120LINPACK_SOURCES = src/fortran/linpack/dgesl.f \ 120LINPACK_SOURCES = src/fortran/linpack/dgesl.f \
121 src/fortran/linpack/wpade.f \ 121 src/fortran/linpack/wpade.f \
122 src/fortran/linpack/util.f \ 122 src/fortran/linpack/util.f \
123 src/fortran/linpack/wcopy.f \ 123 src/fortran/linpack/wcopy.f \
124 src/fortran/linpack/dgefa.f \ 124 src/fortran/linpack/dgefa.f \
125 src/fortran/linpack/dgbfa.f \ 125 src/fortran/linpack/dgbfa.f \
@@ -133,8 +133,7 @@ LINPACK_SOURCES = src/fortran/linpack/dgesl.f \
133 src/fortran/linpack/wgeco.f \ 133 src/fortran/linpack/wgeco.f \
134 src/fortran/linpack/wgefa.f \ 134 src/fortran/linpack/wgefa.f \
135 src/fortran/linpack/wgesl.f \ 135 src/fortran/linpack/wgesl.f \
136 src/fortran/linpack/dpofa.f \ 136 src/fortran/linpack/dpofa.f
137 src/fortran/linpack/util.f
138 137
139ELEMENTARIES_FUNCTIONS_FORTRAN_SOURCES = \ 138ELEMENTARIES_FUNCTIONS_FORTRAN_SOURCES = \
140src/fortran/psi.f \ 139src/fortran/psi.f \
diff --git a/scilab/modules/elementary_functions/Makefile.in b/scilab/modules/elementary_functions/Makefile.in
index 8b14ffd..4b1df27 100644
--- a/scilab/modules/elementary_functions/Makefile.in
+++ b/scilab/modules/elementary_functions/Makefile.in
@@ -212,6 +212,7 @@ am__objects_1 = libscielementary_functions_la-zwrsk.lo \
212 libscielementary_functions_la-pchim.lo 212 libscielementary_functions_la-pchim.lo
213am__objects_2 = libscielementary_functions_la-dgesl.lo \ 213am__objects_2 = libscielementary_functions_la-dgesl.lo \
214 libscielementary_functions_la-wpade.lo \ 214 libscielementary_functions_la-wpade.lo \
215 libscielementary_functions_la-util.lo \
215 libscielementary_functions_la-wcopy.lo \ 216 libscielementary_functions_la-wcopy.lo \
216 libscielementary_functions_la-dgefa.lo \ 217 libscielementary_functions_la-dgefa.lo \
217 libscielementary_functions_la-dgbfa.lo \ 218 libscielementary_functions_la-dgbfa.lo \
@@ -225,8 +226,7 @@ am__objects_2 = libscielementary_functions_la-dgesl.lo \
225 libscielementary_functions_la-wgeco.lo \ 226 libscielementary_functions_la-wgeco.lo \
226 libscielementary_functions_la-wgefa.lo \ 227 libscielementary_functions_la-wgefa.lo \
227 libscielementary_functions_la-wgesl.lo \ 228 libscielementary_functions_la-wgesl.lo \
228 libscielementary_functions_la-dpofa.lo \ 229 libscielementary_functions_la-dpofa.lo
229 libscielementary_functions_la-util.lo
230am__objects_3 = libscielementary_functions_la-balbak.lo 230am__objects_3 = libscielementary_functions_la-balbak.lo
231am__objects_4 = libscielementary_functions_la-sci_tools.lo \ 231am__objects_4 = libscielementary_functions_la-sci_tools.lo \
232 libscielementary_functions_la-finite.lo \ 232 libscielementary_functions_la-finite.lo \
@@ -871,7 +871,7 @@ src/fortran/slatec/pchim.f
871 871
872LINPACK_SOURCES = src/fortran/linpack/dgesl.f \ 872LINPACK_SOURCES = src/fortran/linpack/dgesl.f \
873 src/fortran/linpack/wpade.f \ 873 src/fortran/linpack/wpade.f \
874 src/fortran/linpack/util.f \ 874 src/fortran/linpack/util.f \
875 src/fortran/linpack/wcopy.f \ 875 src/fortran/linpack/wcopy.f \
876 src/fortran/linpack/dgefa.f \ 876 src/fortran/linpack/dgefa.f \
877 src/fortran/linpack/dgbfa.f \ 877 src/fortran/linpack/dgbfa.f \
@@ -885,8 +885,7 @@ LINPACK_SOURCES = src/fortran/linpack/dgesl.f \
885 src/fortran/linpack/wgeco.f \ 885 src/fortran/linpack/wgeco.f \
886 src/fortran/linpack/wgefa.f \ 886 src/fortran/linpack/wgefa.f \
887 src/fortran/linpack/wgesl.f \ 887 src/fortran/linpack/wgesl.f \
888 src/fortran/linpack/dpofa.f \ 888 src/fortran/linpack/dpofa.f
889 src/fortran/linpack/util.f
890 889
891ELEMENTARIES_FUNCTIONS_FORTRAN_SOURCES = \ 890ELEMENTARIES_FUNCTIONS_FORTRAN_SOURCES = \
892src/fortran/psi.f \ 891src/fortran/psi.f \
@@ -2186,6 +2185,9 @@ libscielementary_functions_la-dgesl.lo: src/fortran/linpack/dgesl.f
2186libscielementary_functions_la-wpade.lo: src/fortran/linpack/wpade.f 2185libscielementary_functions_la-wpade.lo: src/fortran/linpack/wpade.f
2187 $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libscielementary_functions_la_FFLAGS) $(FFLAGS) -c -o libscielementary_functions_la-wpade.lo `test -f 'src/fortran/linpack/wpade.f' || echo '$(srcdir)/'`src/fortran/linpack/wpade.f 2186 $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libscielementary_functions_la_FFLAGS) $(FFLAGS) -c -o libscielementary_functions_la-wpade.lo `test -f 'src/fortran/linpack/wpade.f' || echo '$(srcdir)/'`src/fortran/linpack/wpade.f
2188 2187
2188libscielementary_functions_la-util.lo: src/fortran/linpack/util.f
2189 $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libscielementary_functions_la_FFLAGS) $(FFLAGS) -c -o libscielementary_functions_la-util.lo `test -f 'src/fortran/linpack/util.f' || echo '$(srcdir)/'`src/fortran/linpack/util.f
2190
2189libscielementary_functions_la-wcopy.lo: src/fortran/linpack/wcopy.f 2191libscielementary_functions_la-wcopy.lo: src/fortran/linpack/wcopy.f
2190 $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libscielementary_functions_la_FFLAGS) $(FFLAGS) -c -o libscielementary_functions_la-wcopy.lo `test -f 'src/fortran/linpack/wcopy.f' || echo '$(srcdir)/'`src/fortran/linpack/wcopy.f 2192 $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libscielementary_functions_la_FFLAGS) $(FFLAGS) -c -o libscielementary_functions_la-wcopy.lo `test -f 'src/fortran/linpack/wcopy.f' || echo '$(srcdir)/'`src/fortran/linpack/wcopy.f
2191 2193
@@ -2228,9 +2230,6 @@ libscielementary_functions_la-wgesl.lo: src/fortran/linpack/wgesl.f
2228libscielementary_functions_la-dpofa.lo: src/fortran/linpack/dpofa.f 2230libscielementary_functions_la-dpofa.lo: src/fortran/linpack/dpofa.f
2229 $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libscielementary_functions_la_FFLAGS) $(FFLAGS) -c -o libscielementary_functions_la-dpofa.lo `test -f 'src/fortran/linpack/dpofa.f' || echo '$(srcdir)/'`src/fortran/linpack/dpofa.f 2231 $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libscielementary_functions_la_FFLAGS) $(FFLAGS) -c -o libscielementary_functions_la-dpofa.lo `test -f 'src/fortran/linpack/dpofa.f' || echo '$(srcdir)/'`src/fortran/linpack/dpofa.f
2230 2232
2231libscielementary_functions_la-util.lo: src/fortran/linpack/util.f
2232 $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libscielementary_functions_la_FFLAGS) $(FFLAGS) -c -o libscielementary_functions_la-util.lo `test -f 'src/fortran/linpack/util.f' || echo '$(srcdir)/'`src/fortran/linpack/util.f
2233
2234libscielementary_functions_la-balbak.lo: src/fortran/eispack/balbak.f 2233libscielementary_functions_la-balbak.lo: src/fortran/eispack/balbak.f
2235 $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libscielementary_functions_la_FFLAGS) $(FFLAGS) -c -o libscielementary_functions_la-balbak.lo `test -f 'src/fortran/eispack/balbak.f' || echo '$(srcdir)/'`src/fortran/eispack/balbak.f 2234 $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(libscielementary_functions_la_FFLAGS) $(FFLAGS) -c -o libscielementary_functions_la-balbak.lo `test -f 'src/fortran/eispack/balbak.f' || echo '$(srcdir)/'`src/fortran/eispack/balbak.f
2236 2235